GitHub: merge conflict in the readme document.
Me: I don’t care just skip it
GitHub: no go just use git to fix it
Me: I DONT WANT TO? CAN YOU JUST ADD SKIP IT OK

What’s do you mean with "skip"? You cannot just skip a merge conflict

It's like someone ask you at party if you want a glass of beer or vodka shot. There are some questions you cannot skip :)

And this folks is how git push --force was born.

- Can I have something to drink?

- Sure! Tea, coffee, something else?

- Just skip it and give me my drink!

Best merge conflict is where it can’t merge blank, indented lines. I’ve had so many of those with readme’s. it’s like git can’t be fucked

@err-occured Maybe. or it is just a software, not a human.

It can't be fucked.

@mElonMusk I should have seen that a mile off 🤣🤣🤣

I need sleep...

@Sumafu I mean like merge all the other files, don’t merge the readme file.

@TheAwesome98 So how should the readme file look after merge?

@gronostaj I mean you merge all the other files, but keep the readme the same as the one on my repository.

@TheAwesome98 How would git know that's what you want? Why not the other one? Why not a mix of both?

Conflicts happen when a file is modified in both heads. And it's modified in both of them for a reason (why would someone modify a file for no reason?). Blindly preferring one head means undoing other head's changes. That's a recipe for problems.

If you really want to do this, read "merge strategies" section of git-merge manual. But don't do this. People don't edit files for no reason. Your merge result must satisfy both of these reasons.