• noddy@beehaw.org
    link
    fedilink
    arrow-up
    1
    ·
    1 year ago

    I prefer rebasing on destination branch before merging. When merging you get all the conflicts at the same time. When rebasing you can address conflicts from one commit at a time. Untangling multiple small knots is easier than one huge spaghetti. Also commit history will be much cleaner.