> On Jul 3, 2015, at 2:00 AM, Tim Brown <tim.br...@cityc.co.uk> wrote: > > Thanks for the help folks! > > I'll take a long hard look at rebasing before I do anything. > It sounds like something my mother would have advised against. > > On 03/07/15 03:52, Alexander D. Knauth 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 masteragain, 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 > > I'm trying to follow that. I think it's not designed for someone who > makes a tweak, is sent down the pit for a month and THEN tries to merge > back into a later master.
As long as other people aren’t changing the code you changed, rebasing should be pretty painless; basically, it just applies the changes that you made to the updated tree. Conflicts only arise when your (automatically constructed) patch don’t apply cleanly. With that said: yes, git’s model is large and complex. 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.
