merge conflict selection dialog - need break, or massive selection
Created originally on Bitbucket by Alex Rayne (Александр Литягин)
Hallow! today i merge to branches that are veeery differ. and i have a lot of conflicts about changed or delete file. more then 1000 files need to be selected. the only way to stop such opertion - is break-down thg from taskmanager. So, there is need an Break selection in this dialog.
or, even much better - provide more selections for all files in directories:
in provided dialog has deleted whole folder cooja/mspsim. So, it would be much pretty , if there is some action selector for folders:
- cooja/
- cooja/apps
- cooja/apps/mspsim
.... - cooja/apps.../mspmote
that selectors are give action for any file in that folder.
in my case, if a have deleted folder in other branch, i could provide an selection for this folder, with it`s hundreds files.