Manual Merge Conflict Resolution

Welcome to the world of merge conflicts! Don't worry, they're a normal part of collaborating with Git. A merge conflict happens when Git can't automatically figure out how to combine changes from two different branches.

This usually occurs when two branches modify the same lines in the same file in different ways, or when one branch deletes a file that another branch modified.

Git is incredibly smart at merging most changes automatically. However, it needs human help when faced with ambiguity. Here are common scenarios:

• Same line, different changes: Two people edit the exact same line of code differently.
• One deletes, one modifies: One branch deletes a file, while another branch modifies it.
• Rename vs. Modify: A file is renamed in one branch and modified in another.

When a merge conflict occurs, Git won't complete the merge automatically. Instead, it will pause the process and tell you which files have conflicts. You'll see a message like this:

After an automatic merge fails, your repository will be in a 'merging' state. You can use git status to see which files are conflicting. These files will be listed as 'unmerged paths'.

Git inserts special markers directly into the conflicting files to show you where the problem is. These markers help you identify the different versions of the code:

• <<<<<<< HEAD: Marks the beginning of your current branch's changes.
• =======: Separates the changes from the two branches.
• >>>>>>> branch-name: Marks the end of the incoming branch's changes.

Let's look at an example. Imagine you have a file hello.txt. Your main branch changed it to 'Hello from main', and a feature branch changed the same line to 'Greetings from feature'. When merging feature into main, the file will look like this:

Your job is to open the conflicting file (e.g., hello.txt) in your text editor. Then, you manually edit the file to remove the conflict markers and choose the desired content. You can combine parts, pick one version, or write something entirely new.

For our hello.txt example, if we want both messages, we might edit it to:

Once you've manually edited the file and removed all conflict markers, you need to tell Git that you've resolved the conflict. You do this by staging the file with git add.

Repeat this for every file listed as 'unmerged paths' by git status.

After all conflicting files are staged, the merge is ready to be committed. Git will usually provide a default merge commit message, which you can accept or modify. This final commit completes the merge process.

You've successfully resolved a merge conflict. Now, let's test your understanding of the next crucial step after manually editing a conflicting file.

You've learned how to manually resolve merge conflicts! It's a fundamental skill for any developer.

• Conflicts happen when Git can't auto-merge changes.
• git status reveals unmerged files.
• Conflict markers (<<<<<<<, =======, >>>>>>>) show divergent code.
• Manually edit files, remove markers, and choose the final content.
• Stage resolved files with git add.
• Complete the merge with git commit.

Practice makes perfect! Conflicts might seem intimidating at first, but with these steps, you'll master them.