Git - Conflicts

From Training Material
Revision as of 14:59, 4 December 2012 by Bernard Szlachta (talk | contribs)
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to navigation Jump to search
Category:Git

Implicate merge

File merge conflict

Tree conflict

how to avoid conflicts???

  • Merge work ask soon and often as possible
  • Make people talk to each other
  • Split big files and classes into smaller one
Retrieved from ‘https://training-course-material.com/index.php?title=Git_-_Conflicts&oldid=8519’