When working in teams with Git, source code conflicts (Merge Conflicts) are inevitable. Whether you are a beginner or an experienced developer, mastering how to resolve Git Merge Conflicts not only protects your codebase but also optimizes your workflow professionally.

This guide from DCSoftTech explains the core nature of Merge Conflicts and provides a step-by-step walkthrough to resolve them accurately.

1. What Is a Git Merge Conflict? Why Does It Happen?

A Git Merge Conflict occurs when Git cannot automatically merge changes from two different branches.

          C3 - C4 (Branch Feature)
         /
C1 - C2 
         \
          C5 - C6 (Branch Main)

Common Causes of Conflicts

• Editing the exact same line of code: Two developers modify the exact same line in the same file across two different branches.

• Deleting a file undergoing edits: One branch deletes a file while another branch continues to modify it.

• Out-of-sync branch merging: A local feature branch has not pulled the latest updates from the target branch (main/master) before creating a Pull Request (PR).

2. Step-by-Step Manual Conflict Resolution

When a conflict occurs, Git pauses the merge process and marks the affected positions inside the files. You can manually resolve them in 4 steps:

Step 1: Identify Conflicted Files

Open your Terminal or Command Prompt in the project directory and run:

git status

Git will list all unresolved files under Unmerged paths (highlighted in red).

Step 2: Inspect and Resolve Conflicted Content

Open the affected file in your code editor (VS Code, WebStorm, etc.). You will see Git’s conflict markers:

<<<<<<< HEAD
// Current code on your active branch (Current Change)
console.log("Hello from DCSoftTech");
=======
// Code from the incoming branch (Incoming Change)
console.log("Welcome to DCSoftTech Studio");
>>>>>>> feature-branch

• <<<<<<< HEAD: Marks the start of the code on your current active branch.

• =======: The divider separating the two conflicting versions.

• >>>>>>> [branch-name]: Marks the end of the code coming from the branch being merged.

How to fix:

1. Keep the correct code block or combine the required logic from both.

2. Remove all conflict markers (<<<<<<<, =======, >>>>>>>).

Step 3: Stage Resolved Files

After modifying and saving the file, notify Git that the conflict has been resolved:

# Stage a specific file
git add <file-name>

# Or stage all resolved files
git add .

Step 4: Complete the Merge Process

Create a commit to complete the conflict resolution:

git commit -m "Fix: Resolve merge conflict between main and feature branch"

3. Recommended Tools for Conflict Resolution

If you prefer not to edit conflict markers manually, modern GUI tools provide streamlined visual diffing:

4. How to Abort a Merge Operation

If a conflict is too complex and you need to roll back to a safe state before attempting the merge again, execute the abort command:

git merge --abort

This command restores your local branch to its exact state prior to running git merge.

5. Best Practices to Avoid Merge Conflicts (DCSoftTech Standards)

To keep workflows smooth and minimize conflicts, developers at DCSoftTech follow these core practices:

1. Pull and Rebase Frequently: Regularly pull updates from the main branch into your feature branch using git pull origin main or git rebase main.

2. Keep Tasks and Commits Small: Avoid long-lived feature branches. Once a feature is complete, submit a PR and merge it promptly.

3. Communicate Across the Team: Inform teammates whenever you alter project folder structures or shared configuration files (e.g., package.json, .env).