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…
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.
Oh, I mean I was talking about Open Source projects. If you just work privately and don’t say at some kind of central place (like a Discord or Matrix server) on what you’re working on, then it can easily happen that just two people do that at the same time without knowing of each other.
git rebase -x theirs origin/main
and then look at the lines your changing to see what needs to be retouchedI’m more of a
git push origin/main —force
guy myselfReject “main” branch, embrace master branch
It’s the same with my colleagues as with my wife. It’s always a race who comes first.
Ayo
Jetbrains IDE is pretty good at solving conflicts.
so true, lol
I’ve got one more! I get stress based tension headaches, which represent as migraine symptoms!
Memes help tho.