> On Jul 2, 2015, at 7:52 PM, Alexander D. Knauth <alexan...@knauth.org> wrote: > > > On Jul 2, 2015, at 1:53 PM, John Clements <cleme...@brinckerhoff.org> wrote: > >> >>> On Jul 2, 2015, at 7:31 AM, Alexander D. Knauth <alexan...@knauth.org> >>> wrote: > >>> After you resolve them you will (I think) need to `git add` the files that >>> you resolved conflicts for, then >>> `git rebase --continue`, and then when the rebase is finished, `git push -f >>> origin topic-branch`. >> >> Also, I think you eventually want to get things back onto the master branch, >> right? After rebasing, you should be able to check out master again, then do >> a >> >> git merge —ff-only topic-branch >> >> at which point you should be able to push cleanly. > > Um, I'm going by Greg Hendershott's advice in his "guide for infrequent > contributors to Racket," but > wouldn't you not want to do that, because that would mess up the master > branch and make it a dirty fork? > > http://www.greghendershott.com/2013/04/a-guide-for-infrequent-contributors-to-racket.html#waiting-is-the-hardest-part > >> In the meantime, you might be tempted to merge your topic branch into your >> own master. Don’t! >> >> If you were to do that, your master would cease being a nice clean mirror of >> the upstream master. Remember how no one likes a dirty fork, so we’re >> diligently using git pull --ff-only upstream master?
That’s a reasonable way to operate. I generally just let my changes float at the top of master, and branch only when it’s time to make a pull request. Managing multiple branches is a lot of work, and it’s easy to lose track if you’re constantly rebasing multiple orthogonal branches. Please note: I only use rebase, not merge. I can see that if you are in the habit of just merging, things could get nasty quite fast. TL;DR. Greg’s instructions are really nice. Use them. John -- You received this message because you are subscribed to the Google Groups "Racket Users" group. To unsubscribe from this group and stop receiving emails from it, send an email to racket-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
