Merge Conflicts Resolver UI needs some work
Created originally on Bitbucket by mawh (MaWh)
Few UI issues in the merge conflicts resolver. I use Beyond Compare as my merge tool
- When clicking Tool Resolve, you should grey out any buttons that are non-functional until the tool is quit. Maybe make the tool resolve button into a "Quit Tool" while it is running?
- Tool Resolve doesn't actually seem to do a tool resolve (with BC at least) - it just opens BC in read-only mode for the files so you can look at them and decide which one you want (which you then take using the TAKE xxx buttons)
- Any way you can make BC show "local <--> other" in the title/address bars rather than showing "parent1 <--> parent2" - it'd be easier to see the local vs other that way?
- The list boxes of conflicting files are particularly irritating because they keep re-selecting all items every time I click a button
-
- Instead they should never select all items (the user should do it manually if he wants)
-
- If I select some items and click "take xxx" then the items should move to the bottom box, and they should be the only items selected (showing me which item(s) I just took (so I can use "Diff to xxx" and beyond compare will allow me to pick some items from the xxx file to merge in)
-
- Lower box could maybe do with a column that has values: Local, Other, Local-Modified, Other-Modified showing me which file I took, and whether I've since edited it (with the diff tool) to incorporate other changes
mostly, solving the "listboxes automatically select all their items too often" would make this ui much improved for me, but the other things, i'd really like