Re:Switched from Subversion to Git
by sokoloff on Sunday August 16, 2009 @10:42AM
(#766148)
When you run svn update and get a conflict on file foo.c, the contents of foo.c indeed have the conflict markers, but svn helpfully leaves you a file called foo.c.mine, which is your originally modified file.
Re:Switched from Subversion to Git
by jrockway on Monday August 17, 2009 @08:19AM
(#767914)
No, I'm saying your tree is gone forever. The files that did not have conflicts have already been merged, but the files that do have conflicts are in their old state. You can't always go back to the "before svn update" state.
I'd hardly call that "gone forever".