Skip to main content
9 events
when toggle format what by license comment
Oct 23, 2023 at 13:49 comment added Daniel Saner +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).
Oct 16, 2020 at 8:26 comment added Slion 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.
Oct 15, 2020 at 14:55 comment added Niels "You could also rebase your development branch on your now up-to-date local master." How can I do this?
May 18, 2019 at 16:55 history edited Slion CC BY-SA 4.0
deleted 3 characters in body
Jun 8, 2018 at 7:25 history edited Slion CC BY-SA 4.0
added 1 character in body
Sep 27, 2017 at 4:36 history edited Slion CC BY-SA 3.0
edited body
Jan 3, 2017 at 17:17 history edited Slion CC BY-SA 3.0
added 10 characters in body
Jan 3, 2017 at 17:06 history edited Slion CC BY-SA 3.0
added 73 characters in body
Jan 3, 2017 at 16:59 history answered Slion CC BY-SA 3.0