My pull request has several merge conflicts but I don't cry. How strong am I?

man git gud

Be a man. Force push.

Oh i remember the times, when i had to resolve a merge conflict, because multiple streams were trying to push to main at the same time.

Took me a couple of hours to resolve by hand 😅

you have merge conflicts in the first place.

so: not at all.

If you got reasonable git integration in your IDE, there is no reason to fear the merge conflict - if you can read code. Just resolve the conflicts in a rebase and submit a new pull request.

That's a great scenario as now you can log more hours to the ticket with ofc abundance of fill-up chill-up time! \o/ It takes eons to resolve those, right (to click that IDE button to keep whichever is the correct, mhm, mhm). And then you have to test it properly if it still works, both run those automated tests and make a jab at it yourself... Heaven.