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.

3
  • 1
    "You could also rebase your development branch on your now up-to-date local master." How can I do this?
    – Niels
    Commented Oct 15, 2020 at 14:55
  • First run git checkout my-dev-branch to switch to your dev branch then git rebase master. You could also just run git rebase master my-dev-branch which basically combine those two commands. See git rebase docs.
    – Slion
    Commented Oct 16, 2020 at 8:26
  • 1
    +1 for advising against working directly on the master of a fork, but rebasing a separate development branch. Most other top answers don't mention it, which will work fine once, but lead to headaches after that due to rewritten commits (rebase) or a merge commit that isn't on upstream (merge). Commented Oct 23, 2023 at 13:49