Talk:Merge (version control)

This article is rated C-class on Wikipedia's content assessment scale. It is of interest to the following WikiProjects:

Computer science Low‑importance This article is within the scope of WikiProject Computer science, a collaborative effort to improve the coverage of Computer science related articles on Wikipedia. If you would like to participate, please visit the project page, where you can join the discussion and see a list of open tasks.Computer scienceWikipedia:WikiProject Computer scienceTemplate:WikiProject Computer scienceComputer science articles Low This article has been rated as Low-importance on the project's importance scale. Things you can help WikiProject Computer science with: Here are some tasks awaiting attention: Article requests : Requested articles/Applied arts and sciences/Computer science, computing, and Internet Cleanup : Computer science articles needing attention Computer science articles needing expert attention Copyedit : Computing Expand : Computer science Infobox : Computer science articles without infoboxes Maintain : Timeline of computing 2020–present Photo : Find pictures for the biographies of computer scientists (see List of computer scientists) Computing articles needing images Stubs : Computer science stubs Unreferenced : WikiProject Computer science/Unreferenced BLPs Project-related : Tag all relevant articles in Category:Computer science and sub-categories with {{WikiProject Computer science}} Computing: Software Low‑importance This article is within the scope of WikiProject Computing, a collaborative effort to improve the coverage of computers, computing, and information technology on Wikipedia. If you would like to participate, please visit the project page, where you can join the discussion and see a list of open tasks.ComputingWikipedia:WikiProject ComputingTemplate:WikiProject ComputingComputing articles Low This article has been rated as Low-importance on the project's importance scale. This article is supported by WikiProject Software.

Why aren't there more than 2 or 3 way merges? I found myself in a situation today where 4-way merge would have been great. Instead I had to have 2 different windows of a 2-way and 3-way open at once.

Do N-way merge tools exist?

Bwbuckley (talk) 01:52, 16 June 2011 (UTC)[reply]

This is a misleading question, caused by the original misleading wording in the article. N-way merges are 3-way merges with more than two derivatives.

89.27.105.187 (talk) 17:41, 31 December 2012 (UTC)[reply]

It lacks objectivity and sources.

- This merge is the most reliable and has performed well in practice.

No sources, personal opinion.

- This automatic merging is something that even experienced programmers (only exposed to a two-way diff) often find miraculous and is an enormous breakthrough in computer science that is normally not taught as such.

No sources, non objective. — Preceding unsigned comment added by Bleakcabal (talk • contribs) 15:45, 22 November 2012 (UTC)[reply]

The "trends" section does not meet Wikipedia's quality criteria. It contains opinions and is not backed up by substantive research or sources.

Should P4Merge be listed here? It seems to have similar functionality to some of the other tools listed. P4Merge is available independently of the rest of Perforce: http://www.perforce.com/product/components/perforce_visual_merge_and_diff_tools and it can be used with other version control systems such as Git. (See, for example, this blog from a Git user who doesn't like or use Perforce: http://www.andymcintosh.com/?p=33 )

DMarti (talk) 18:54, 5 February 2013 (UTC)[reply]

There is nothing here in relation to the correctness of the resulting merge. All of the merges in play currently appear to be somewhat unintelligent in that we haven't yet gotten to the ability of a computer to analyse a program and check that one person's change is in fact compatible with with another persons - the merges are for most part pretty dumb.

ZhuLien (talk) 15:28, 13 January 2015 (UTC)[reply]

I believe CVS started as a set of scripts on RCS, not diff3. diff3 would only have been used for merging, which is only one aspect of a version control system. ^[1]

Hello fellow Wikipedians,

I have just modified one external link on Merge (version control). Please take a moment to review my edit. If you have any questions, or need the bot to ignore the links, or the page altogether, please visit this simple FaQ for additional information. I made the following changes:

• Added archive https://web.archive.org/web/20110719115019/http://lists.zooko.com/pipermail/revctrl/2005-May/000005.html to http://lists.zooko.com/pipermail/revctrl/2005-May/000005.html

When you have finished reviewing my changes, you may follow the instructions on the template below to fix any issues with the URLs.

This message was posted before February 2018. After February 2018, "External links modified" talk page sections are no longer generated or monitored by InternetArchiveBot. No special action is required regarding these talk page notices, other than regular verification using the archive tool instructions below. Editors have permission to delete these "External links modified" talk page sections if they want to de-clutter talk pages, but see the RfC before doing mass systematic removals. This message is updated dynamically through the template {{source check}} (last update: 18 January 2022).

• If you have discovered URLs which were erroneously considered dead by the bot, you can report them with this tool.
• If you found an error with any archives or the URLs themselves, you can fix them with this tool.

Cheers.—InternetArchiveBot (Report bug) 04:22, 26 January 2018 (UTC)[reply]