Do all the things like ++ or -- rants, post your own rants, comment on others' rants and build your customized dev avatarSign Up
From the creators of devRant, Pipeless lets you power real-time personalized recommendations and activity feeds using a simple APILearn More
Be responsible: rebase early, rebase often.
Just check which merged branch caused the conflict, do an interactive rebase on master, completely removing their merge from history.
Then set your git mail/name to the competing author's mail/name, create a new PR from their branch, edit title/description to be identical to the original PR.
Then tell that author that you approved their PR, but that they do still have to resolve some merge conflicts... and they're like "but Bob told me yesterday that he merged my PR!", to which you reply: "Yeah but I think Bob was a bit drunk".
ChristoPy58554dBefore a learn about rebase, I can say that every week I got merge conflicts overwriting my code.
I learned the hard way, resolving conflicts one by one, by hand. Just to be sure that my progress wasn't lost.
Always remember to rebase, also if you want to sync your branch before commit, use the stash command, will help you out!
Velvaretta11I gor a problem with my gf, and she asked for space, then i got a new problem in my workplace, i want to kill ...
uuid17My anxiety is kicking in again. I want to build something meaningful outside of work but my mind is blank, I ...
UltimateZero2>first day on the job (first ever) >received job interview email from another company literally the moment I e...