What's the difference between SVN and Git for merging?
Posted
by Alexander
on Stack Overflow
See other posts from Stack Overflow
or by Alexander
Published on 2010-04-22T17:13:02Z
Indexed on
2010/04/22
17:23 UTC
Read the original article
Hit count: 150
git
|subversion
As the title suggests, I am curious as to why so many people tout Git as a superior alternative to branching/merging over SVN. I am primarily curious because SVN merging sucks and I would like an alternative solution.
How does Git handle merging better? How does it work?
For example, in SVN, if I have the following line:
Hello World!
Then user1 changes it to:
Hello World!1
then user2 changes it to:
Hello World!12
Then user2 commits, then user1 commits, SVN would give you a conflict. Can Git resolve something simple as this?
© Stack Overflow or respective owner
