Re:Confessions of a Git Skeptic
by antris on Wednesday February 20, 2013 @01:31PM
(#5252255)
> Subversion we had a simple rule: "If you get a conflict, save your work outside of the project, then "accept theirs full", then re-integrate your work. A pain, but non-technical people could manage it
You can do this in git as well.