Why Git is hard - eviltoast
  • Morton Fox@pawb.social
    link
    fedilink
    arrow-up
    7
    ·
    1 year ago

    I use rebase when I’m working in a dev branch. If someone else has pushed changes to the main branch, rebasing the dev branch on top of main is a way to do the hard work of resolving merge conflicts up front. Then I can rerun tests and make sure everything still works with changes from the main branch. And finally, when it is time to merge my dev branch to main, it’s a simple fast-forward.