search

rhysd / conflict-marker.vim

Weapon to fight against conflicts in Vim.
498 stars 18 forks source link

Naming conventions #14

Closed kkoomen closed 4 years ago

kkoomen commented 4 years ago

I suggest you use ours and theirs in the README as this is more clear and reflects the actual git naming convention. Right now it's ourselves and theirselves which just sounds weird.

rhysd commented 4 years ago

Thanks for the point. Fixed in 30f281b.

ranelpadon commented 3 years ago

"@rhysd @kkoomen The ours and theirs are not always accurate/appropriate though: if I try to merge my branch to a release branch or master/main as target, the HEAD becomes ours, and my branch become theirs which is confusing. I expect that my branch should be ours regardless of the target. But it seems that ours always map to HEAD, am I correct?

VS Code has this naming: Current Change and Upcoming Change:

Screen Shot 2021-04-15 at 2 33 42 PM

Atom has this naming though: Our Changes and Their Changes

Screen Shot 2021-04-15 at 2 37 37 PM

VS Code has better naming I think, since HEAD is not always ours, since it depends on the direction of the merge. Maybe we could tweak the behavior of the plugin to switch the "ours" as needed, or just use better naming like in VS Code? At the very least, I could customize my mapping instead of using the default co and ct. :)