search

guberm / tortoisegit

Automatically exported from code.google.com/p/tortoisegit
0 stars 0 forks source link

Conflict dialog does not allow resolving multiple or all conflicts with the same option. #1839

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
What steps will reproduce the problem?
1. Get into a state where you need to resolve multiple conflicts during pull
2. 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?
1.8.4.0
1.8.3.msysgit.0

On what operating system?

Windows 8

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.

Original issue reported on code.google.com by jheriko on 17 Jul 2013 at 8:30

GoogleCodeExporter commented 9 years ago 
for clarity this is the window i am referring to. it appears during the 'sync' 
operation when there are conflicts to be resolved

Original comment by jheriko on 17 Jul 2013 at 8:32

Attachments:

GoogleCodeExporter commented 9 years ago

Original comment by ch3co...@gmail.com on 17 Jul 2013 at 8:55

GoogleCodeExporter commented 9 years ago 
This issue was closed by revision 329f6d2f968b.

Original comment by ch3co...@gmail.com on 17 Jul 2013 at 12:51

GoogleCodeExporter commented 9 years ago 
Still does not seem to work (in TortoiseGit 1.8.12.0) in the "Commit" dialog 
after having selected "TortoiseGit > Merge" from the context menu.

Steps:
1) Mark multiple conflicting files (with shift or ctrl and clicking)
2) Right-click and select "resolve conflict using 'theirs'". 

Result: It seems only the conflict you right-clicked gets resolved, not all the 
selected conflicts.

Original comment by bja...@it-kartellet.dk on 16 Feb 2015 at 6:22

GoogleCodeExporter commented 9 years ago 
@bjarke: I just re-tested. Works for me. Please open a new issue and provide 
further steps to reproduce this issue (and maybe Debug information 
https://code.google.com/p/tortoisegit/wiki/HOWTO_Debug).

Original comment by sstrickr...@googlemail.com on 28 Feb 2015 at 10:23

GoogleCodeExporter commented 9 years ago 
to quote myself: "works for me is not even a test."

i can try and repro myself and see what i find. but no promises. i stopped 
using TortoiseGit day-to-day quite a while ago now...

Original comment by jheriko on 2 Mar 2015 at 1:17

GoogleCodeExporter commented 9 years ago 
This feature resolving multiple or all conflicts with the same option does not 
work in the actual version (1.8.14.0, Windwos 7).

Original comment by demarm...@mst.ch on 23 Apr 2015 at 1:14

GoogleCodeExporter commented 9 years ago 
If this is still an issue for you with our latest release, please provide a 
demo repository and exact steps on how to reproduce this issue. - On my tests 
everything worked as expected. Thanks!

Original comment by sstrickr...@googlemail.com on 25 May 2015 at 8:03