Installation istructions fail - at least for confused people like me

[matkoniecz]

copy /lib/git-resolve-conflict.sh to your .bashrc (this adds just git resolve-conflict)

I copied file contents into my .bashrc file. Not sure how it would add git ... but I tried anyway.

Predictably git resolve-conflict --theirs app/src/main/res/values-da/strings.xml failed with

`git: 'resolve-conflict' is not a git command. See 'git --help'.``

(because why adding function to .bashrc file would create a git function?

Maybe .gitconfig also should be modified? I have for example lg = "!gitk --all&" there.

Looking at how it is defined I expected resolve-conflict() --theirs app/src/main/res/values-da/strings.xml to work, but this failed with

bash: syntax error near unexpected token --theirs'`

---

Feel free to close it with "hahahahaha, learn to use Linux" but I just wanted to let you know that the current installation instruction is a bit confusing - at least to me.

[matkoniecz]

It looks to me like I should rather copy https://github.com/jakub-g/git-resolve-conflict/tree/base/bin content somewhere, but I am not sure right now.