[feature-request] Git resolve conflicts

[devinrhode2]

Sometimes there are linting or formatting changes performed by tools, not humans. Conflicts with these changes can be automatically resolved by committing with a certain syntax in the commit message, and then re-running the command by parsing that syntax.

For example, you can commit like this:

• Run yarn prettier . --write
• Run yarn eslint --fix

When your co-worker's pr has merged which reformats the whole codebase, you could have a lot of conflicts.

A new git alias could help here: git resolve-conflicts

It will basically do some sort of git pull origin main --rebase but will additionally auto-resolve commits which have this Run ... syntax

It's almost like a git fixup/squash/amend commit, I probably have talked about this idea on stack overflow. Syntax could be:

exec! yarn prettier . --write

[devinrhode2]

Related/inspiration: https://stackoverflow.com/questions/71812872/how-to-rebase-when-prettier-formatting-was-applied-to-whole-project

[CervEdin]

I don't know if it's what you're looking for but I wrote a script to auto resolve merge conflicts using ours or theirs or both

https://github.com/CervEdin/gut/blob/main/git-resolve.sh

It uses sed to just take one side or the other, or both, while leaving the non-conflicting parts of the file alone

See this original stackoverflow answer
https://stackoverflow.com/a/68498101