From 2764342cc4efeb1ec579f0bc6c0543e08e6a08cc Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Sun, 9 Aug 2009 23:52:08 +0200 Subject: [PATCH] CG: warn about rebasing when editing translation committishes --- Documentation/contributor/git-starting.itexi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Documentation/contributor/git-starting.itexi b/Documentation/contributor/git-starting.itexi index 0a150d0049..d3886c525a 100644 --- a/Documentation/contributor/git-starting.itexi +++ b/Documentation/contributor/git-starting.itexi @@ -188,6 +188,20 @@ master branch in your @file{.git/config}, like so: rebase = true @end example +@warning{translators and documentation editors, if you have changed +committishes in the head of translated files using commits you have not +yet pushed to @code{git.sv.gnu.org}, please do not rebase. If you want +to avoid wondering whether you should rebase each time you pull, please +always use committishes from master and/or lilypond/translation branch +on @code{git.sv.gnu.org}, which in particular implies that you must push +your changes to documentation except committishes updates (possibly +after having rebased), then update the committishes and push them.} + +@c FIXME: when committishes automatic conditional update have been +@c tested and documented, append the following to the warning above: +@c Note that using update-committishes make target generally touches +@c committishes. + @node Resolving conflicts @subsection Resolving conflicts -- 2.39.5