Multiselect + Rapid resolve (ours/theirs)

[staik]

Hi, I have been evaluating sublime merge for a bit now, and one of my biggest grievances has been with the inability to multi select multiple files in the side bar, under ‘Unmerged Files’, ‘Modified Files’, and ‘Staged Files’ and the lack of context options to stage, unstage, track the selected group.

In addition to that, during a merge conflict or rebase for large projects with a lot of branches, the inability to select multiple files and right click > ‘Resolve using Ours/Theirs’ is also very painful.

I end up having to always open the gitgui for windows in order to take care of these sanely, and I would much rather be able to do these via sublime merge.

Are there any plans to get features like these in?

Thanks,
MS

[srbs]

see also:

Is it possible to select multiple files for staging?

is it possible to select multiple files for staging? Or, running git commands directly in the commands palete:

A workaround for in cases of resolving/staging an entire folder tree, you can do something similar to:

Ignore file/directory (menu items)

Decided today to write up a simple ignore file & ignore directory menu item. Both menu items are implemented using a git alias which also allows command line usage if wanted: ignore file: git smerge-ignore path/to/file ignore directory: git smerge-fetch path/to/file dir Notes/Caveats: duplicate entries are skipped when identified but no add/remove lines if the reverse logic is needed directories are always suffixed with / Steps: add this git alias: git config --global alias.smer…