2014-07-19 12:59 GMT+02:00 David Kastrup <[email protected]>: > Thomas Morley <[email protected]> writes: > >> Hi, >> >> because of that unwanted merge while the patch for issue 3992 was >> pushed, i'm not sure what to do with my own patch for issue 4008. >> >> Should I wait before I push myself? > > If the question is whether we will going to change anything in the > repository: no. Any cleanup is going to leave more of a mess. If the > question is whether you should be checking with gitk immediately before > calling "git push" if your change looks like being nicely on top of > existing master/staging: yes, of course. > > If it isn't, we'll walk through any problems. The CG recipe cited is > not really helpful there. Personally, I just do > > git fetch > git rebase origin/master mybranch > git push origin HEAD:staging > > This will refuse pushing when staging is ahead of master. While it is > possible to rebase on staging instead of master and push, I usually > prefer to let staging catch up with master (through patchy) before doing > my own push. In case someone else borked staging, I avoid having to > clean up my version of the branch in order to remove the borked staging > commits. > > Of course, checking with gitk before the push is still a good idea. I > don't use gitk actually but rather > > git log --decorate --graph > > -- > David Kastrup
Trying to do harm@harm-laptop ~/lilypond-git (dev/typo-cc)$ git push origin HEAD:staging returns To ssh://[email protected]/srv/git/lilypond.git ! [rejected] HEAD -> staging (non-fast-forward) error: failed to push some refs to 'ssh://[email protected]/srv/git/lilypond.git' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. 'git log --decorate --graph' returns * commit 61e7691619505561eaa46b96e0a0d9fe6617274d (HEAD, dev/typo-cc) | Author: Thomas Morley <[email protected]> | Date: Sun Jul 13 13:45:03 2014 +0200 | | typo/oversight in align-interface.cc and page-layout-problem.cc | | issue 4008 | | fix oversight in doc-string of align-interface.cc | fix typo in comment of page-layout-problem.cc | * commit 4935f81a94ae1b98cd017a96571c153cee3e5686 (origin/master, origin/HEAD, master, dev/handle-grace) |\ Merge: ae14152 6071d12 | | Author: David Nalesnik <[email protected]> | | Date: Fri Jul 18 17:49:39 2014 -0500 | | | | Merge branch 'dev/dodecaphonic_no_repeat' into staging | | | * commit 6071d12f8cb830c5761445c45ac76d942638b57d | | Author: David Nalesnik <[email protected]> | | Date: Sat Jul 5 20:01:40 2 Looks ok for me in my naivity, although I notice the branch dev/handle-grace. I accidentaly did an rebase with this branch with 'git rebase origin dev/handle-grace' I'd think this shouldn't matter. Am I wrong? Nevertheless, 'git push --help' confuses me more than helping. How to proceed? Cheers, Harm _______________________________________________ lilypond-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-devel
