Skip to content

Instantly share code, notes, and snippets.

@YKV

YKV/gitCollaboration.txt

Created June 27, 2016 23:33
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save YKV/2de33c4de0088272c8cd6a4774449020 to your computer and use it in GitHub Desktop.
Save YKV/2de33c4de0088272c8cd6a4774449020 to your computer and use it in GitHub Desktop.
Download ZIP
Git Collaboration & Merge Conflicts (Pair Exercise)
Raw
gitCollaboration.txt
Question 1: During this linear process, where Dev B changed the document after Dev A had already committed and pushed their change to the remote (github), what extra step(s) could Developer B have taken to completely avoid this merge conflict?
The Dev B could work on separate branch or make pull request first to avoid merging conflicts
Question 2: Given your answer in Q1, does this mean that merge conflicts can be completely (always) avoided in the real world? Why or why not?
If two developers work on the same file simultaneously merge conflict cannot be avoided.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment