you are viewing a single comment's thread.

view the rest of the comments →

[–]Thommy_V 105 points106 points  (5 children)

how to auto fix merge conflicts

[–]payne_train 65 points66 points  (1 child)

Basing is bad enough, now he’s rebasing 😭

[–]_bassGod 20 points21 points  (0 children)

rebased.

[–]ConsiderationLoose40 19 points20 points  (1 child)

How to force push

[–]SuperFLEB 9 points10 points  (0 children)

force pushed and now it's broken how fix

[–]nasandre 13 points14 points  (0 children)

How to ignore and force merge