Conflict dialog does not allow resolving multiple or all conflicts with the same option.
By jher... on July 17, 2013 08:30 (imported from Google Code)
What steps will reproduce the problem?
- Get into a state where you need to resolve multiple conflicts during pull
- Observe window showing conflicts and providing option to resolve each file individually
What is the expected output?
The ability to select multiple files for 'resolve using theirs' or 'resolve using mine'
What do you see instead?
If this feature exists it is implemented in a non standard (i.e. not using shift or drag to multi-select) or obscure way (none of the widgets on the window seem to provide a way towards that functionality).
What version of TortoiseGit and msysgit are you using?
On what operating system?
Please provide any additional information below.
This is not a bug, but it is a severe hinderance on projects who are forced to use inconsiderate or poorly designed tools which result in having to resolve many hundreds or thousands of files using 'resolve theirs'. This situation is fairly common if you use some kind of tool generated binary data and rely heavily on branching/merging.
This is not a totally uncommon situation in the 'real world' - and one that the UI seems currently impractical for dealing with.
Using the command line is a possible workaround.