svn update command automatically resolves conflicts if two developers have modified same files. If I appended a line at the bottom while my collegue inserted a line in the middle. When I try to update from remote repository, my change is still at the bottom with updated file.
How this can be handled in git? Everytime I merge, I have conflicts because of simple changes from multiple developers on the same files.
SVN and Git apply incoming changes in the same way: non-overlapping changes (local and remote) are applied without conflict, overlapping changes will produce merge-conflicts.
Both tools calculate context-aware chunks of changes. They do not examine text as single-lines. If the width of the context in Git is bigger than that of SVN (default for SVN is 3 lines), you'll get different results for the same sources. Otherwise merging in Git and SVN should give the same results.
Collected from the Internet
Please contact [email protected] to delete if infringement.
Comments