Workflow for resolving merge conflicts | Notion

Step 1: Identify Conflicts:

Git will notify you about conflicts during a merge operation. Files with conflicts will be marked as conflicted, and Git will insert conflict markers (<<<<<<<, =======, and >>>>>>>) to highlight conflicting sections.

Step 2: Open Conflicted Files:

Open the conflicted files in your code editor. Within these files, you'll see sections separated by the conflict markers. Each section represents changes from different branches.

Step 3: Manually Resolve Conflicts:

Review each conflicted section and decide how to merge the changes. You can keep one version, the other, or create a completely new version. Remove the conflict markers once you've resolved the issues.

Step 4: Add Resolved Files:

After manually resolving conflicts, add the resolved files to the staging area using:
```
git add <file1> <file2> ...
```

Step 5: Commit Changes:

Complete the merge process by committing the changes:
```
git commit -m "Merge conflict resolution"
```

Step 6: Continue with Merge:

If you were in the middle of a merge when conflicts occurred, complete the merge operation by running:
```
git merge --continue
```
Alternatively, Abort Merge:

If you decide to abandon the merge operation:
```
git merge --abort
```

Step 7: Push Changes:

After resolving conflicts, push the changes to the remote repository:
```
git push origin <branch-name>
```