Databases
StackOverflow2013
Postsdbo
POIs git's merge conflict resolution more efficient than other SCMs and merge tools?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POIs git's merge conflict resolution more efficient than other SCMs and merge tools?
    primarykey
    data
    text
    <p>Is <code>git</code>'s merge conflict resolution <em>inherently</em> more efficient than other SCMs (CVS,Subversion,etc.), and also standalone merge tools? If so, why?</p> <p>Clarification: <em>here</em> I'm more interested in the algorithm itself - is it any different from a plain diff3 method?<br> Some tools claim to be smarter in that(e.g. Guiffy), is it worth plugging one in as a git merge tool? Is git any smarter in figuring out pieces of text moved within or across files ? (rather than reporting noisy conflicts.. I had a vague impression of that from Linus' talk).</p> <p>Background: just did a huge merge using <code>git-svn</code> which resulted in half the conflicts than I got with plain <code>svn merge</code> (first merge with no tracking) .. so I'd like to understand why.</p> <hr> <p>The are similar Qs/As around but they are more about the big picture of the process, and how merging fits in that more naturally. To that end, <code>git</code> being 'optimised for merges' (as opposed to only branching), does it actually mean:</p> <ol> <li>less manual conflicts -- better auto-resolution algorithms (eg. renaming is handled nicely) </li> <li>safer operation -- auto-resolution leaves more/only real conflicts and less false alerts</li> <li>faster operation -- say, due to the lean &amp; mean object model</li> <li>better tooling -- which makes the experience less painful, e.g. DAG-based merge tracking, mergetool, history query/visualisation, stash, rebase,etc...</li> <li>something else</li> <li>a combination of the above</li> </ol> <p>? Now, I'm mostly interested in 1 &amp; 2.</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USSamuel Rossille
    1. USinger
    plurals
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    3. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POIs git's merge conflict resolution more efficient than other SCMs and merge tools?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POIs git's merge conflict resolution more efficient than other SCMs and merge tools?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POIs git's merge conflict resolution more efficient than other SCMs and merge tools?
      1. USVonC
      1. VTFavorite
    1. COhttp://stackoverflow.com/questions/2475831/merging-hg-git-vs-svn or http://stackoverflow.com/questions/2518779/what-are-the-benefits-of-mercurial-or-git-over-svn-for-branching-merging can provide some answers (mostly compared to SVN), and don't forget http://stackoverflow.com/questions/612580/how-does-git-solve-the-merging-problem
      singulars
      1. POIs git's merge conflict resolution more efficient than other SCMs and merge tools?
      1. USVonC
    2. COThanks, those links are really useful - and I could not find them myself.
      singulars
      1. POIs git's merge conflict resolution more efficient than other SCMs and merge tools?
      1. USinger
    3. CO@inger, So close the question as duplicate?
      singulars
      1. POIs git's merge conflict resolution more efficient than other SCMs and merge tools?
      1. USVi.
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload