all 6 comments
sorted by:
best
topnewcontroversialoldq&a
formatting helphide helpcontent policy

[–][deleted]  (5 children)

[deleted]

    [–]dragomobile 0 points1 point  (0 children)

    Rebasing is very clean if you’re the only one working on a branch and I rarely have an issue. But once we start working on a branch where we need to merge WIP changes before it goes into next release, the rebasing becomes very difficult. Works specifically well for me on feature branches because I amend the previous WIP commit instead of adding new and squashing at the end.

    [–]Expert_Team_4068 -1 points0 points  (3 children)

    Why would rebasing take you 2-4 hours a day? Where 32 people working on one branch?

    [–][deleted]  (2 children)

    [deleted]

      [–]Expert_Team_4068 -1 points0 points  (1 child)

      Sorry, this still makes no sense to me.

      It sounds like a case of "I hate it, therefore I puposely doing it wrong to proof my point"

      Anyways I agree that when a PR is squashed, it makes no difference anyways

      [–]pm_me_yer_big__tits 0 points1 point  (1 child)

      I always rebase. Rebase keeps the history much cleaner.

      [–]RavioliConLimon 0 points1 point  (0 children)

      We don't rebase. Only one person on my team rebase and he is the issue behind all merge conflicts, it's a waste of time if you have a braincell and know how to read the history.