mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lo/doc-merge-submodule-update'

Browse Source 
What happens to submodules during merge has been documented in a
bit more detail.

* lo/doc-merge-submodule-update:
  merge-strategies.adoc: detail submodule merge
This commit is contained in:
Junio C Hamano
2025-03-03 08:53:02 -08:00
parent ab09eddf60 4ebba56419
commit 238c8d3984
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/merge-strategies.adoc
View File

@ -22,6 +22,13 @@ ort::
was written as a replacement for the previous default
algorithm, `recursive`.
+
In the case where the path is a submodule, if the submodule commit used on
one side of the merge is a descendant of the submodule commit used on the
other side of the merge, Git attempts to fast-forward to the
descendant. Otherwise, Git will treat this case as a conflict, suggesting
as a resolution a submodule commit that is descendant of the conflicting
ones, if one exists.
+
The 'ort' strategy can take the following options:
ours;;
@ -96,6 +103,9 @@ recursive::
the default strategy for resolving two heads from Git v0.99.9k
until v2.33.0.
+
For a path that is a submodule, the same caution as 'ort' applies to this
strategy.
+
The 'recursive' strategy takes the same options as 'ort'. However,
there are three additional options that 'ort' ignores (not documented
above) that are potentially useful with the 'recursive' strategy: