r
/
notebook
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
notebook/notes/git/merge-conflicts.md

2.5 KiB
Raw Permalink Blame History

title TARGET DECK FILE TAGS tags
Merge Conflicts Obsidian::STEM git::merge
git

Overview

Merge conflicts are denoted by <<<<<<<, =======, and >>>>>>> markers.

%%ANKI Basic What marker denotes the start of a merge conflict section? Back: <<<<<<< Reference: Scott Chacon, Pro Git, Second edition, The Expert’s Voice in Software Development (New York, NY: Apress, 2014).

END%%

%%ANKI Basic What marker denotes the end of a merge conflict section? Back: >>>>>>> Reference: Scott Chacon, Pro Git, Second edition, The Expert’s Voice in Software Development (New York, NY: Apress, 2014).

END%%

%%ANKI Basic What marker separates differences between two branches in a merge conflict section? Back: ======= Reference: Scott Chacon, Pro Git, Second edition, The Expert’s Voice in Software Development (New York, NY: Apress, 2014).

END%%

%%ANKI Basic In a git merge, which branch's changes are listed first in a merge conflict section? Back: The branch you are currently on, i.e. HEAD. Reference: Scott Chacon, Pro Git, Second edition, The Expert’s Voice in Software Development (New York, NY: Apress, 2014).

END%%

%%ANKI Basic In a git merge, what changes are after <<<<<<< and before =======? Back: The changes present on the current branch. Reference: Scott Chacon, Pro Git, Second edition, The Expert’s Voice in Software Development (New York, NY: Apress, 2014).

END%%

%%ANKI Basic In a git merge, what changes are after >>>>>>> and before =======? Back: N/A. Reference: Scott Chacon, Pro Git, Second edition, The Expert’s Voice in Software Development (New York, NY: Apress, 2014).

END%%

%%ANKI Basic In a git merge, what changes are after ======= and before >>>>>>>? Back: The changes present on the branch being merged into HEAD. Reference: Scott Chacon, Pro Git, Second edition, The Expert’s Voice in Software Development (New York, NY: Apress, 2014).

END%%

%%ANKI Basic In a git merge, what changes are after ======= and before <<<<<<<? Back: N/A. Reference: Scott Chacon, Pro Git, Second edition, The Expert’s Voice in Software Development (New York, NY: Apress, 2014).

END%%

Bibliography

  • Scott Chacon, Pro Git, Second edition, The Expert’s Voice in Software Development (New York, NY: Apress, 2014).