• Knusper@feddit.deEnglish
    1·
    2 years ago

    Merge early and merge often.

    And ideally, each commit represents a working state of your software. If your team is disciplined enough with that, you can save yourself the feature branches and merges.

  • Korne127@lemmy.worldEnglish
    0·
    2 years ago

    Merge conflict in general is fine

    What’s really bad is if someone drastically changed the implementation of something which you’ve also changed and if you completely need to rework it…

    • RedditWanderer@lemmy.worldEnglish
      1·
      2 years ago

      What’s really bad is if someone drastically changed the implementation of something which you’ve also changed

      That’s not a merge conflict, that’s a management conflict.

  • The Cuuuuube@beehaw.orgEnglish
    0·
    2 years ago

    git rebase -x theirs origin/main and then look at the lines your changing to see what needs to be retouched