Ayende @ Rahienhttp://ayende.comAyende @ RahienCopyright (C) Ayende Rahien 2004 - 2021 (c) 202660Gian Maria commented on Doing merges in gitIt would be interesting having more deep comparison between merging in DVCS and standard centralized system like svn. Is true indeed that git stores more information for merges than SVN, but usually I do merge in svn with no great pain. Tortoise for svn show changes files, conflicted files, and I can open the diff from the tortoise windows, resolve the conflicts, check the merge and commit, basically I see the same windows you show with tortoise git. Clearly svn only compare the actual state of the source and destination folder, but usually is enough for me. Alk. http://ayende.com/4670/doing-merges-in-git#comment10http://ayende.com/4670/doing-merges-in-git#comment10Tue, 26 Oct 2010 09:06:40 GMTAyende Rahien commented on Doing merges in gitJim, Basically, it records each individual change, so it is able to do merge on each change independently, while SVN need to do merge between the final results. http://ayende.com/4670/doing-merges-in-git#comment9http://ayende.com/4670/doing-merges-in-git#comment9Mon, 25 Oct 2010 15:17:28 GMTJim commented on Doing merges in gitWhat sort of data does git store that makes it much better at merging than SVN? http://ayende.com/4670/doing-merges-in-git#comment8http://ayende.com/4670/doing-merges-in-git#comment8Mon, 25 Oct 2010 10:36:07 GMTAyende Rahien commented on Doing merges in gitYes http://ayende.com/4670/doing-merges-in-git#comment7http://ayende.com/4670/doing-merges-in-git#comment7Mon, 25 Oct 2010 06:17:27 GMTJimmy Chan commented on Doing merges in gitAyende, Are you using tortoise for git? http://ayende.com/4670/doing-merges-in-git#comment6http://ayende.com/4670/doing-merges-in-git#comment6Mon, 25 Oct 2010 00:30:19 GMTJosh commented on Doing merges in gitTobi, I too see much less manual merging with git than svn/cvs. Funny, yhe only 2 projects where i've had to do a manual merge are FluentMigrator (my fault) and RavenDB (which was probably also my fault). http://ayende.com/4670/doing-merges-in-git#comment5http://ayende.com/4670/doing-merges-in-git#comment5Sun, 24 Oct 2010 18:46:28 GMTAyende Rahien commented on Doing merges in gitTobi, Yes, git is keeping much more data, so it can handle it better http://ayende.com/4670/doing-merges-in-git#comment4http://ayende.com/4670/doing-merges-in-git#comment4Sat, 23 Oct 2010 17:49:58 GMTJD commented on Doing merges in gitI'm surprised to see that dialog...you strike me a "git bash" type of guy. ;) http://ayende.com/4670/doing-merges-in-git#comment3http://ayende.com/4670/doing-merges-in-git#comment3Sat, 23 Oct 2010 16:08:09 GMTGonzalo commented on Doing merges in gitMerging with any of the major implementations of DVCS is easier and requires much less work than SVN or any other centralized VCS because the system inherently has more information at hand to perform the merge. http://ayende.com/4670/doing-merges-in-git#comment2http://ayende.com/4670/doing-merges-in-git#comment2Sat, 23 Oct 2010 16:07:00 GMTtobi commented on Doing merges in gitDid you notice that merging with git requires less work than with svn? This is what everyone says at least. http://ayende.com/4670/doing-merges-in-git#comment1http://ayende.com/4670/doing-merges-in-git#comment1Sat, 23 Oct 2010 10:50:33 GMT