4 Resolving Merge Conflicts

Two Notes

This cheatsheet assumes that you’ve already set your preferred Git conflict strategy to merge. For instructions on that process, look here.

For more details on merge conflicts, see the Merge Conflicts section.

Open and fix the .Rmd files (delete markers, save). Do NOT touch the HTML files. Git’s merge markers are as follows:
- <<<<<<< HEAD: Marks the beginning of your local changes.
- =======: Separates your changes from the incoming changes.
- >>>>>>> a1b2...: Marks the end of the incoming changes.
Rebuild the book
git add
git commit
git push