Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

2
  • I forgot to mention that I have uncommitted changes that should be committed on branch1, but after branch1 is up to date with master. will the method you have proposed leave the current changes untouched to be committed later on branch1? Commented Aug 8, 2016 at 12:03
  • In this case, that's a lot better to commit first (that way, if you mess around you will always be to fix and retry), then rebase and if you're not completely satisfied with your commit, amend it or at last 'reset --soft'
    – Philippe
    Commented Aug 8, 2016 at 16:47