Two developers working on the same files at the same time is a suboptimal arrangement, and should it arise, actual communication outside of the VCS is necessary.
Git automates patchset management, not merging of rapidly diverging branches of the -same- code. With or without git, independent developers working on a set of patches for the same code will introduce genuine implementation conflicts that can not be merged without independent communication.
If, however, you should find yourself in this remarkably inefficient situation (ie, a commit war over simultaneously modified files), I recommend:
1) Speak to the other developer.
2) svn diff >saved.diff && svn up
OR
tar -cf ../svn.bak.tar . && svn up
Git automates patchset management, not merging of rapidly diverging branches of the -same- code. With or without git, independent developers working on a set of patches for the same code will introduce genuine implementation conflicts that can not be merged without independent communication.
If, however, you should find yourself in this remarkably inefficient situation (ie, a commit war over simultaneously modified files), I recommend:
1) Speak to the other developer.
2) svn diff >saved.diff && svn up OR tar -cf ../svn.bak.tar . && svn up