Gecko [ sachasauda.akalacademy.ac.in ]

Name	Size	Permission
api-allocation-growing.html	17.55 KB	-rw-r--r--
api-allocation-growing.txt	1019 B	-rw-r--r--
api-argv-array.html	19.44 KB	-rw-r--r--
api-argv-array.txt	2.12 KB	-rw-r--r--
api-builtin.html	19.43 KB	-rw-r--r--
api-builtin.txt	2 KB	-rw-r--r--
api-config.html	23.39 KB	-rw-r--r--
api-config.txt	5.18 KB	-rw-r--r--
api-credentials.html	27.9 KB	-rw-r--r--
api-credentials.txt	8.87 KB	-rw-r--r--
api-decorate.html	16.23 KB	-rw-r--r--
api-decorate.txt	60 B	-rw-r--r--
api-diff.html	24.32 KB	-rw-r--r--
api-diff.txt	5.22 KB	-rw-r--r--
api-directory-listing.html	20.75 KB	-rw-r--r--
api-directory-listing.txt	2.71 KB	-rw-r--r--
api-gitattributes.html	21.9 KB	-rw-r--r--
api-gitattributes.txt	3.62 KB	-rw-r--r--
api-grep.html	16.31 KB	-rw-r--r--
api-grep.txt	76 B	-rw-r--r--
api-hash.html	18.42 KB	-rw-r--r--
api-hash.txt	1.4 KB	-rw-r--r--
api-hashmap.html	35.57 KB	-rw-r--r--
api-hashmap.txt	7.71 KB	-rw-r--r--
api-history-graph.html	24.08 KB	-rw-r--r--
api-history-graph.txt	5.9 KB	-rw-r--r--
api-in-core-index.html	16.96 KB	-rw-r--r--
api-in-core-index.txt	457 B	-rw-r--r--
api-index-skel.txt	431 B	-rw-r--r--
api-index.html	18.45 KB	-rw-r--r--
api-index.sh	611 B	-rw-r--r--
api-index.txt	1.68 KB	-rw-r--r--
api-lockfile.html	20.05 KB	-rw-r--r--
api-lockfile.txt	2.92 KB	-rw-r--r--
api-merge.html	21.36 KB	-rw-r--r--
api-merge.txt	3.3 KB	-rw-r--r--
api-object-access.html	16.73 KB	-rw-r--r--
api-object-access.txt	342 B	-rw-r--r--
api-parse-options.html	31.03 KB	-rw-r--r--
api-parse-options.txt	9.36 KB	-rw-r--r--
api-quote.html	16.42 KB	-rw-r--r--
api-quote.txt	145 B	-rw-r--r--
api-ref-iteration.html	19.71 KB	-rw-r--r--
api-ref-iteration.txt	2.41 KB	-rw-r--r--
api-remote.html	21.26 KB	-rw-r--r--
api-remote.txt	3.3 KB	-rw-r--r--
api-revision-walking.html	19.76 KB	-rw-r--r--
api-revision-walking.txt	2.39 KB	-rw-r--r--
api-run-command.html	28.25 KB	-rw-r--r--
api-run-command.txt	8.08 KB	-rw-r--r--
api-setup.html	16.51 KB	-rw-r--r--
api-setup.txt	180 B	-rw-r--r--
api-sha1-array.html	19.39 KB	-rw-r--r--
api-sha1-array.txt	2.25 KB	-rw-r--r--
api-sigchain.html	17.74 KB	-rw-r--r--
api-sigchain.txt	1.34 KB	-rw-r--r--
api-strbuf.html	32.15 KB	-rw-r--r--
api-strbuf.txt	10.17 KB	-rw-r--r--
api-string-list.html	26.42 KB	-rw-r--r--
api-string-list.txt	6.84 KB	-rw-r--r--
api-tree-walking.html	23.17 KB	-rw-r--r--
api-tree-walking.txt	4.27 KB	-rw-r--r--
api-xdiff-interface.html	16.3 KB	-rw-r--r--
api-xdiff-interface.txt	139 B	-rw-r--r--
index-format.html	27.12 KB	-rw-r--r--
index-format.txt	6.29 KB	-rw-r--r--
pack-format.html	24.08 KB	-rw-r--r--
pack-format.txt	5.54 KB	-rw-r--r--
pack-heuristics.html	42.74 KB	-rw-r--r--
pack-heuristics.txt	17.77 KB	-rw-r--r--
pack-protocol.html	43.12 KB	-rw-r--r--
pack-protocol.txt	20.99 KB	-rw-r--r--
protocol-capabilities.html	25.41 KB	-rw-r--r--
protocol-capabilities.txt	7.09 KB	-rw-r--r--
protocol-common.html	20.08 KB	-rw-r--r--
protocol-common.txt	2.7 KB	-rw-r--r--
racy-git.html	26.85 KB	-rw-r--r--
racy-git.txt	8.63 KB	-rw-r--r--
send-pack-pipeline.html	18.73 KB	-rw-r--r--
send-pack-pipeline.txt	1.92 KB	-rw-r--r--
shallow.html	18.86 KB	-rw-r--r--
shallow.txt	2.3 KB	-rw-r--r--
trivial-merge.html	21.62 KB	-rw-r--r--
trivial-merge.txt	4.16 KB	-rw-r--r--

Code Editor : trivial-merge.html

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.8" />
<title>Trivial merge rules</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */

/* Default font. */
body {
  font-family: Georgia,serif;
}

/* Title font. */
h1, h2, h3, h4, h5, h6,
div.title, caption.title,
thead, p.table.header,
#toctitle,
#author, #revnumber, #revdate, #revremark,
#footer {
  font-family: Arial,Helvetica,sans-serif;
}

body {
  margin: 1em 5% 1em 5%;
}

a {
  color: blue;
  text-decoration: underline;
}
a:visited {
  color: fuchsia;
}

em {
  font-style: italic;
  color: navy;
}

strong {
  font-weight: bold;
  color: #083194;
}

h1, h2, h3, h4, h5, h6 {
  color: #527bbd;
  margin-top: 1.2em;
  margin-bottom: 0.5em;
  line-height: 1.3;
}

h1, h2, h3 {
  border-bottom: 2px solid silver;
}
h2 {
  padding-top: 0.5em;
}
h3 {
  float: left;
}
h3 + * {
  clear: left;
}
h5 {
  font-size: 1.0em;
}

div.sectionbody {
  margin-left: 0;
}

hr {
  border: 1px solid silver;
}

p {
  margin-top: 0.5em;
  margin-bottom: 0.5em;
}

ul, ol, li > p {
  margin-top: 0;
}
ul > li     { color: #aaa; }
ul > li > * { color: black; }

.monospaced, code, pre {
  font-family: "Courier New", Courier, monospace;
  font-size: inherit;
  color: navy;
  padding: 0;
  margin: 0;
}

#author {
  color: #527bbd;
  font-weight: bold;
  font-size: 1.1em;
}
#email {
}
#revnumber, #revdate, #revremark {
}

#footer {
  font-size: small;
  border-top: 2px solid silver;
  padding-top: 0.5em;
  margin-top: 4.0em;
}
#footer-text {
  float: left;
  padding-bottom: 0.5em;
}
#footer-badges {
  float: right;
  padding-bottom: 0.5em;
}

#preamble {
  margin-top: 1.5em;
  margin-bottom: 1.5em;
}
div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
  margin-top: 1.0em;
  margin-bottom: 1.5em;
}
div.admonitionblock {
  margin-top: 2.0em;
  margin-bottom: 2.0em;
  margin-right: 10%;
  color: #606060;
}

div.content { /* Block element content. */
  padding: 0;
}

/* Block element titles. */
div.title, caption.title {
  color: #527bbd;
  font-weight: bold;
  text-align: left;
  margin-top: 1.0em;
  margin-bottom: 0.5em;
}
div.title + * {
  margin-top: 0;
}

td div.title:first-child {
  margin-top: 0.0em;
}
div.content div.title:first-child {
  margin-top: 0.0em;
}
div.content + div.title {
  margin-top: 0.0em;
}

div.sidebarblock > div.content {
  background: #ffffee;
  border: 1px solid #dddddd;
  border-left: 4px solid #f0f0f0;
  padding: 0.5em;
}

div.listingblock > div.content {
  border: 1px solid #dddddd;
  border-left: 5px solid #f0f0f0;
  background: #f8f8f8;
  padding: 0.5em;
}

div.quoteblock, div.verseblock {
  padding-left: 1.0em;
  margin-left: 1.0em;
  margin-right: 10%;
  border-left: 5px solid #f0f0f0;
  color: #888;
}

div.quoteblock > div.attribution {
  padding-top: 0.5em;
  text-align: right;
}

div.verseblock > pre.content {
  font-family: inherit;
  font-size: inherit;
}
div.verseblock > div.attribution {
  padding-top: 0.75em;
  text-align: left;
}
/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
  text-align: left;
}

div.admonitionblock .icon {
  vertical-align: top;
  font-size: 1.1em;
  font-weight: bold;
  text-decoration: underline;
  color: #527bbd;
  padding-right: 0.5em;
}
div.admonitionblock td.content {
  padding-left: 0.5em;
  border-left: 3px solid #dddddd;
}

div.exampleblock > div.content {
  border-left: 3px solid #dddddd;
  padding-left: 0.5em;
}

div.imageblock div.content { padding-left: 0; }
span.image img { border-style: none; }
a.image:visited { color: white; }

dl {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
}
dt {
  margin-top: 0.5em;
  margin-bottom: 0;
  font-style: normal;
  color: navy;
}
dd > *:first-child {
  margin-top: 0.1em;
}

ul, ol {
    list-style-position: outside;
}
ol.arabic {
  list-style-type: decimal;
}
ol.loweralpha {
  list-style-type: lower-alpha;
}
ol.upperalpha {
  list-style-type: upper-alpha;
}
ol.lowerroman {
  list-style-type: lower-roman;
}
ol.upperroman {
  list-style-type: upper-roman;
}

div.compact ul, div.compact ol,
div.compact p, div.compact p,
div.compact div, div.compact div {
  margin-top: 0.1em;
  margin-bottom: 0.1em;
}

tfoot {
  font-weight: bold;
}
td > div.verse {
  white-space: pre;
}

div.hdlist {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
}
div.hdlist tr {
  padding-bottom: 15px;
}
dt.hdlist1.strong, td.hdlist1.strong {
  font-weight: bold;
}
td.hdlist1 {
  vertical-align: top;
  font-style: normal;
  padding-right: 0.8em;
  color: navy;
}
td.hdlist2 {
  vertical-align: top;
}
div.hdlist.compact tr {
  margin: 0;
  padding-bottom: 0;
}

.comment {
  background: yellow;
}

.footnote, .footnoteref {
  font-size: 0.8em;
}

span.footnote, span.footnoteref {
  vertical-align: super;
}

#footnotes {
  margin: 20px 0 20px 0;
  padding: 7px 0 0 0;
}

#footnotes div.footnote {
  margin: 0 0 5px 0;
}

#footnotes hr {
  border: none;
  border-top: 1px solid silver;
  height: 1px;
  text-align: left;
  margin-left: 0;
  width: 20%;
  min-width: 100px;
}

div.colist td {
  padding-right: 0.5em;
  padding-bottom: 0.3em;
  vertical-align: top;
}
div.colist td img {
  margin-top: 0.3em;
}

@media print {
  #footer-badges { display: none; }
}

#toc {
  margin-bottom: 2.5em;
}

#toctitle {
  color: #527bbd;
  font-size: 1.1em;
  font-weight: bold;
  margin-top: 1.0em;
  margin-bottom: 0.1em;
}

div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
  margin-top: 0;
  margin-bottom: 0;
}
div.toclevel2 {
  margin-left: 2em;
  font-size: 0.9em;
}
div.toclevel3 {
  margin-left: 4em;
  font-size: 0.9em;
}
div.toclevel4 {
  margin-left: 6em;
  font-size: 0.9em;
}

span.aqua { color: aqua; }
span.black { color: black; }
span.blue { color: blue; }
span.fuchsia { color: fuchsia; }
span.gray { color: gray; }
span.green { color: green; }
span.lime { color: lime; }
span.maroon { color: maroon; }
span.navy { color: navy; }
span.olive { color: olive; }
span.purple { color: purple; }
span.red { color: red; }
span.silver { color: silver; }
span.teal { color: teal; }
span.white { color: white; }
span.yellow { color: yellow; }

span.aqua-background { background: aqua; }
span.black-background { background: black; }
span.blue-background { background: blue; }
span.fuchsia-background { background: fuchsia; }
span.gray-background { background: gray; }
span.green-background { background: green; }
span.lime-background { background: lime; }
span.maroon-background { background: maroon; }
span.navy-background { background: navy; }
span.olive-background { background: olive; }
span.purple-background { background: purple; }
span.red-background { background: red; }
span.silver-background { background: silver; }
span.teal-background { background: teal; }
span.white-background { background: white; }
span.yellow-background { background: yellow; }

span.big { font-size: 2em; }
span.small { font-size: 0.6em; }

span.underline { text-decoration: underline; }
span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }

div.unbreakable { page-break-inside: avoid; }

/*
 * xhtml11 specific
 *
 * */

div.tableblock {
  margin-top: 1.0em;
  margin-bottom: 1.5em;
}
div.tableblock > table {
  border: 3px solid #527bbd;
}
thead, p.table.header {
  font-weight: bold;
  color: #527bbd;
}
p.table {
  margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
  border-style: none;
}
div.tableblock > table[frame="hsides"] {
  border-left-style: none;
  border-right-style: none;
}
div.tableblock > table[frame="vsides"] {
  border-top-style: none;
  border-bottom-style: none;
}

/*
 * html5 specific
 *
 * */

table.tableblock {
  margin-top: 1.0em;
  margin-bottom: 1.5em;
}
thead, p.tableblock.header {
  font-weight: bold;
  color: #527bbd;
}
p.tableblock {
  margin-top: 0;
}
table.tableblock {
  border-width: 3px;
  border-spacing: 0px;
  border-style: solid;
  border-color: #527bbd;
  border-collapse: collapse;
}
th.tableblock, td.tableblock {
  border-width: 1px;
  padding: 4px;
  border-style: solid;
  border-color: #527bbd;
}

table.tableblock.frame-topbot {
  border-left-style: hidden;
  border-right-style: hidden;
}
table.tableblock.frame-sides {
  border-top-style: hidden;
  border-bottom-style: hidden;
}
table.tableblock.frame-none {
  border-style: hidden;
}

th.tableblock.halign-left, td.tableblock.halign-left {
  text-align: left;
}
th.tableblock.halign-center, td.tableblock.halign-center {
  text-align: center;
}
th.tableblock.halign-right, td.tableblock.halign-right {
  text-align: right;
}

th.tableblock.valign-top, td.tableblock.valign-top {
  vertical-align: top;
}
th.tableblock.valign-middle, td.tableblock.valign-middle {
  vertical-align: middle;
}
th.tableblock.valign-bottom, td.tableblock.valign-bottom {
  vertical-align: bottom;
}

/*
 * manpage specific
 *
 * */

body.manpage h1 {
  padding-top: 0.5em;
  padding-bottom: 0.5em;
  border-top: 2px solid silver;
  border-bottom: 2px solid silver;
}
body.manpage h2 {
  border-style: none;
}
body.manpage div.sectionbody {
  margin-left: 3em;
}

@media print {
  body.manpage div#toc { display: none; }
}

</style>
<script type="text/javascript">
/*<![CDATA[*/
var asciidoc = {  // Namespace.

/////////////////////////////////////////////////////////////////////
// Table Of Contents generator
/////////////////////////////////////////////////////////////////////

/* Author: Mihai Bazon, September 2002
 * http://students.infoiasi.ro/~mishoo
 *
 * Table Of Content generator
 * Version: 0.4
 *
 * Feel free to use this script under the terms of the GNU General Public
 * License, as long as you do not remove or alter this notice.
 */

/* modified by Troy D. Hanson, September 2006. License: GPL */
 /* modified by Stuart Rackham, 2006, 2009. License: GPL */

// toclevels = 1..4.
toc: function (toclevels) {

function getText(el) {
    var text = "";
    for (var i = el.firstChild; i != null; i = i.nextSibling) {
      if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
        text += i.data;
      else if (i.firstChild != null)
        text += getText(i);
    }
    return text;
  }

function TocEntry(el, text, toclevel) {
    this.element = el;
    this.text = text;
    this.toclevel = toclevel;
  }

var toc = document.getElementById("toc");
  if (!toc) {
    return;
  }

// Delete existing TOC entries in case we're reloading the TOC.
  var tocEntriesToRemove = [];
  var i;
  for (i = 0; i < toc.childNodes.length; i++) {
    var entry = toc.childNodes[i];
    if (entry.nodeName.toLowerCase() == 'div'
     && entry.getAttribute("class")
     && entry.getAttribute("class").match(/^toclevel/))
      tocEntriesToRemove.push(entry);
  }
  for (i = 0; i < tocEntriesToRemove.length; i++) {
    toc.removeChild(tocEntriesToRemove[i]);
  }

// Rebuild TOC entries.
  var entries = tocEntries(document.getElementById("content"), toclevels);
  for (var i = 0; i < entries.length; ++i) {
    var entry = entries[i];
    if (entry.element.id == "")
      entry.element.id = "_toc_" + i;
    var a = document.createElement("a");
    a.href = "#" + entry.element.id;
    a.appendChild(document.createTextNode(entry.text));
    var div = document.createElement("div");
    div.appendChild(a);
    div.className = "toclevel" + entry.toclevel;
    toc.appendChild(div);
  }
  if (entries.length == 0)
    toc.parentNode.removeChild(toc);
},

/////////////////////////////////////////////////////////////////////
// Footnotes generator
/////////////////////////////////////////////////////////////////////

/* Based on footnote generation code from:
 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
 */

footnotes: function () {
  // Delete existing footnote entries in case we're reloading the footnodes.
  var i;
  var noteholder = document.getElementById("footnotes");
  if (!noteholder) {
    return;
  }
  var entriesToRemove = [];
  for (i = 0; i < noteholder.childNodes.length; i++) {
    var entry = noteholder.childNodes[i];
    if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
      entriesToRemove.push(entry);
  }
  for (i = 0; i < entriesToRemove.length; i++) {
    noteholder.removeChild(entriesToRemove[i]);
  }

// Rebuild footnote entries.
  var cont = document.getElementById("content");
  var spans = cont.getElementsByTagName("span");
  var refs = {};
  var n = 0;
  for (i=0; i<spans.length; i++) {
    if (spans[i].className == "footnote") {
      n++;
      var note = spans[i].getAttribute("data-note");
      if (!note) {
        // Use [\s\S] in place of . so multi-line matches work.
        // Because JavaScript has no s (dotall) regex flag.
        note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
        spans[i].innerHTML =
          "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
          "' title='View footnote' class='footnote'>" + n + "</a>]";
        spans[i].setAttribute("data-note", note);
      }
      noteholder.innerHTML +=
        "<div class='footnote' id='_footnote_" + n + "'>" +
        "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
        n + "</a>. " + note + "</div>";
      var id =spans[i].getAttribute("id");
      if (id != null) refs["#"+id] = n;
    }
  }
  if (n == 0)
    noteholder.parentNode.removeChild(noteholder);
  else {
    // Process footnoterefs.
    for (i=0; i<spans.length; i++) {
      if (spans[i].className == "footnoteref") {
        var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
        href = href.match(/#.*/)[0];  // Because IE return full URL.
        n = refs[href];
        spans[i].innerHTML =
          "[<a href='#_footnote_" + n +
          "' title='View footnote' class='footnote'>" + n + "</a>]";
      }
    }
  }
},

install: function(toclevels) {
  var timerId;

function reinstall() {
    asciidoc.footnotes();
    if (toclevels) {
      asciidoc.toc(toclevels);
    }
  }

function reinstallAndRemoveTimer() {
    clearInterval(timerId);
    reinstall();
  }

timerId = setInterval(reinstall, 500);
  if (document.addEventListener)
    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
  else
    window.onload = reinstallAndRemoveTimer;
}

}
asciidoc.install();
/*]]>*/
</script>
</head>
<body class="article">
<div id="header">
<h1>Trivial merge rules</h1>
</div>
<div id="content">
<div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This document describes the outcomes of the trivial merge logic in read-tree.</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_one_way_merge">One-way merge</h2>
<div class="sectionbody">
<div class="paragraph"><p>This replaces the index with a different tree, keeping the stat info
for entries that don&#8217;t change, and allowing -u to make the minimum
required changes to the working tree to have it match.</p></div>
<div class="paragraph"><p>Entries marked <em>+</em> have stat information. Spaces marked <em>*</em> don&#8217;t
affect the result.</p></div>
<div class="literalblock">
<div class="content">
<pre><code>index   tree    result
-----------------------
*       (empty) (empty)
(empty) tree    tree
index+  tree    tree
index+  index   index+</code></pre>
</div></div>
</div>
</div>
<div class="sect1">
<h2 id="_two_way_merge">Two-way merge</h2>
<div class="sectionbody">
<div class="paragraph"><p>It is permitted for the index to lack an entry; this does not prevent
any case from applying.</p></div>
<div class="paragraph"><p>If the index exists, it is an error for it not to match either the old
or the result.</p></div>
<div class="paragraph"><p>If multiple cases apply, the one used is listed first.</p></div>
<div class="paragraph"><p>A result which changes the index is an error if the index is not empty
and not up-to-date.</p></div>
<div class="paragraph"><p>Entries marked <em>+</em> have stat information. Spaces marked <em>*</em> don&#8217;t
affect the result.</p></div>
<div class="literalblock">
<div class="content">
<pre><code>case  index   old     new     result
-------------------------------------
0/2   (empty) *       (empty) (empty)
1/3   (empty) *       new     new
4/5   index+  (empty) (empty) index+
6/7   index+  (empty) index   index+
10    index+  index   (empty) (empty)
14/15 index+  old     old     index+
18/19 index+  old     index   index+
20    index+  index   new     new</code></pre>
</div></div>
</div>
</div>
<div class="sect1">
<h2 id="_three_way_merge">Three-way merge</h2>
<div class="sectionbody">
<div class="paragraph"><p>It is permitted for the index to lack an entry; this does not prevent
any case from applying.</p></div>
<div class="paragraph"><p>If the index exists, it is an error for it not to match either the
head or (if the merge is trivial) the result.</p></div>
<div class="paragraph"><p>If multiple cases apply, the one used is listed first.</p></div>
<div class="paragraph"><p>A result of "no merge" means that index is left in stage 0, ancest in
stage 1, head in stage 2, and remote in stage 3 (if any of these are
empty, no entry is left for that stage). Otherwise, the given entry is
left in stage 0, and there are no other entries.</p></div>
<div class="paragraph"><p>A result of "no merge" is an error if the index is not empty and not
up-to-date.</p></div>
<div class="paragraph"><p><strong>empty</strong> means that the tree must not have a directory-file conflict
 with the entry.</p></div>
<div class="paragraph"><p>For multiple ancestors, a <em>+</em> means that this case applies even if
only one ancestor or remote fits; a <em>^</em> means all of the ancestors
must be the same.</p></div>
<div class="literalblock">
<div class="content">
<pre><code>case  ancest    head    remote    result
----------------------------------------
1     (empty)+  (empty) (empty)   (empty)
2ALT  (empty)+  *empty* remote    remote
2     (empty)^  (empty) remote    no merge
3ALT  (empty)+  head    *empty*   head
3     (empty)^  head    (empty)   no merge
4     (empty)^  head    remote    no merge
5ALT  *         head    head      head
6     ancest+   (empty) (empty)   no merge
8     ancest^   (empty) ancest    no merge
7     ancest+   (empty) remote    no merge
10    ancest^   ancest  (empty)   no merge
9     ancest+   head    (empty)   no merge
16    anc1/anc2 anc1    anc2      no merge
13    ancest+   head    ancest    head
14    ancest+   ancest  remote    remote
11    ancest+   head    remote    no merge</code></pre>
</div></div>
<div class="paragraph"><p>Only #2ALT and #3ALT use <strong>empty</strong>, because these are the only cases
where there can be conflicts that didn&#8217;t exist before. Note that we
allow directory-file conflicts between things in different stages
after the trivial merge.</p></div>
<div class="paragraph"><p>A possible alternative for #6 is (empty), which would make it like
#1. This is not used, due to the likelihood that it arises due to
moving the file to multiple different locations or moving and deleting
it in different branches.</p></div>
<div class="paragraph"><p>Case #1 is included for completeness, and also in case we decide to
put on <em>+</em> markings; any path that is never mentioned at all isn&#8217;t
handled.</p></div>
<div class="paragraph"><p>Note that #16 is when both #13 and #14 apply; in this case, we refuse
the trivial merge, because we can&#8217;t tell from this data which is
right. This is a case of a reverted patch (in some direction, maybe
multiple times), and the right answer depends on looking at crossings
of history or common ancestors of the ancestors.</p></div>
<div class="paragraph"><p>Note that, between #6, #7, #9, and #11, all cases not otherwise
covered are handled in this table.</p></div>
<div class="paragraph"><p>For #8 and #10, there is alternative behavior, not currently
implemented, where the result is (empty). As currently implemented,
the automatic merge will generally give this effect.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2013-06-10 20:01:55 UTC
</div>
</div>
</body>
</html>

${this.title}

Code Editor : trivial-merge.html