From: Janek WarchoĊ‚ Date: Sun, 5 Jan 2014 18:46:52 +0000 (+0100) Subject: Revert "CG merge duplicated sections about conflicts and branches" X-Git-Tag: release/2.19.1-1~38 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8108cbe2a26c25f7f43464589eeea692f86e8c65;p=lilypond.git Revert "CG merge duplicated sections about conflicts and branches" This reverts commit 916c0ca2da746592d6355f7d3a5ed19024754210. --- diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi index 3acb915dde..7b60706ab1 100644 --- a/Documentation/contributor/source-code.itexi +++ b/Documentation/contributor/source-code.itexi @@ -612,6 +612,7 @@ hopefully be documented in the near future. @menu * Organization of remote branches:: * LilyPond repository sources:: +* Other branches:: @end menu @@ -641,25 +642,6 @@ significant changes to the English documentation. See @ref{Translating the documentation} for details. -Most contributors will never need to touch the other branches. If -you wish to do so, you will need more familiarity with Git; please -see @ref{Other Git documentation}. - -@itemize -@item @code{dev/XYZ}: -These branches are for individual developers. They store code -which is not yet stable enough to be added to the @code{master} -branch. - -@item @code{stable/XYZ}: -The branches are kept for archival reasons. - -@item @code{archive/XYZ}: -The branches are kept for archival reasons. - -@end itemize - - @node LilyPond repository sources @unnumberedsubsubsec LilyPond repository sources @@ -685,6 +667,28 @@ up to use it. Also, the HTTP protocol is slowest, so it should only be used as a last resort. +@node Other branches +@unnumberedsubsubsec Other branches + +Most contributors will never need to touch the other branches. If +you wish to do so, you will need more familiarity with Git; please +see @ref{Other Git documentation}. + +@itemize +@item @code{dev/XYZ}: +These branches are for individual developers. They store code +which is not yet stable enough to be added to the @code{master} +branch. + +@item @code{stable/XYZ}: +The branches are kept for archival reasons. + +@item @code{archive/XYZ}: +The branches are kept for archival reasons. + +@end itemize + + @node Basic Git procedures @section Basic Git procedures @@ -733,7 +737,7 @@ possible, since outdated patches require extra work before they can be used. Occasionally you may need to rework some of your own modifications -to match changes made to the remote branch (see @ref{Merge +to match changes made to the remote branch (see @ref{Resolving conflicts}), and it's considerably easier to rework things incrementally. If you don't update your repository along the way, you may have to spend a lot of time resolving branch conflicts and @@ -796,7 +800,7 @@ git stash pop # reapply previously saved changes Note that @command{git@tie{}stash@tie{}pop} will try to apply a patch, and this may create a conflict. If this happens, see -@ref{Merge conflicts}. +@ref{Resolving conflicts}. TODO: I think the next paragraph is confusing. Perhaps prepare the reader for new terms `committish' and `head'? -mp @@ -924,7 +928,7 @@ git checkout @var{bar} git merge @var{foo} @end example -If any conflict happens, see @ref{Merge conflicts}. +If any conflict happens, see @ref{Resolving conflicts}. There are common usage cases for merging: as a translator, you will often want the Translations meister to merge @code{master} into @@ -1366,6 +1370,7 @@ several Git branches of LilyPond source code is presented. @menu * Merge conflicts:: * Advanced Git concepts:: +* Resolving conflicts:: * Reverting all local changes:: * Git log:: * Applying remote patches:: @@ -1379,20 +1384,8 @@ several Git branches of LilyPond source code is presented. @node Merge conflicts @subsection Merge conflicts - -Occasionally an update may result in conflicts -- this happens -when you and somebody else have modified the same part of the same -file and git cannot figure out how to merge the two versions -together. When this happens, you must manually merge the two -versions. - -If you need some documentation to understand and resolve -conflicts, see paragraphs @emph{How conflicts are presented} and -@emph{How to resolve conflicts} in @command{git merge} man page. - -If all else fails, you can follow the instructions in -@ref{Reverting all local changes}. Be aware that this eliminates -any changes you have made! +To be filled in later, and/or moved to a different section. I +just wanted to make sure that I had a stub ready somewhere. @node Advanced Git concepts @@ -1434,6 +1427,25 @@ referring to a branch, one often actually thinks about its head and the ancestor commits of the head. +@node Resolving conflicts +@subsection Resolving conflicts + + +Occasionally an update may result in conflicts -- this happens +when you and somebody else have modified the same part of the same +file and git cannot figure out how to merge the two versions +together. When this happens, you must manually merge the two +versions. + +If you need some documentation to understand and resolve +conflicts, see paragraphs @emph{How conflicts are presented} and +@emph{How to resolve conflicts} in @command{git merge} man page. + +If all else fails, you can follow the instructions in +@ref{Reverting all local changes}. Be aware that this eliminates +any changes you have made! + + @node Reverting all local changes @subsection Reverting all local changes