Hi Reinhold,

Truly sorry to admit I have polluted the history tree again.

Here is my tree

~/GIT/Lily/---------------(branches master and lilypond/translation)
            |
            ---Mentors/---(my clone of the master branch)
            |
            ---Traduc/----(my clone of the lp/translation branch)


Please correct me if I anything is wrong in my procedure:

I do all my "traffic" (translating and building) in Traduc, where I do a "git pull" quite often as you have noticed. Once I'm ready, I do:

cd ..
git branch (to be sure I'm on the right one)
git checkout lilypond/translation (if necessary)
git pull trans (shorthand for "lilypond/translation")
cd Traduc
git pull
git fsck
git gc      (and then if nothing seems wrong)
git-status and commit (within emacs)
git format-patch origin
git push
cd ..
git format-patch trans
git push trans




TIA
Jean-Charles



_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to