Git - Conflicts: Difference between revisions
Jump to navigation
Jump to search
mNo edit summary |
(No difference)
|
Latest revision as of 14:59, 4 December 2012
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
