Feature: Choose Ours/Theirs/Both for entire File

[ariel-frischer]

I really like this plugin, only thing I wish it has would be some util functions Choose ours/theirs/both for the entire file. The use case is, I had a yarn.lock file where many conflicts occurred. It had over 400 conflicts which is actually normal for a larger codebase. Going to next conflict and resolving in this case is not feasible, I just created a quick macro and called it +400 times which worked but seems janky and inefficient. A command mode function for this situation seems appropriate.

[akinsho]

Would be happy to take a PR to implement something like this, maybe allowing the commands to take a visual range 🤷🏿‍♂️. Probably not going to work on this myself though, as I definitely don't have the time.

[Chaitanyabsprip]

A vim macro should be a decent solution for this.

[partounian]

This is super late, but why not just use git checkout {branch_name} -- {filepath} to checkout the file from the branch you want?

[ariel-frischer]

This is super late, but why not just use git checkout {branch_name} -- {filepath} to checkout the file from the branch you want?

Yea good point.

[jgarciaokode]

Hi, is this possible then? I don't know how to create that action, should we wait for a solution from the plugin author o could we implemente something on our own?

[Tokarak]

I'm for using a visual selection; that makes it much more general than the whole file.

[CWood-sdf]

I made a PR for this that adds visual mode remaps a few months ago, but it hasnt gotten any comments or anything from @akinsho so im not really sure if it's going to be merged

[akinsho]

@CWood-sdf thanks for the PR I noticed it but have not really had the time to look into open source projects given work and life, let alone this is one of my smaller plugins 😅. It's on my todo list