Update(Pull) - conflict dialog
1. I modified, added and committed a local file
2. Made changes to a file in the remote repository and then did a "Pull"
The update(Pull) dialog actually displays completed with a green tick mark and developer assumed that the the pull is successfull since the dialog displays the green tick. At one glance developer cannot see that the merge is unsuccessful for 2 reasons - 1 completed message with tick mark + the following message is hidden --> using strategy resolve resulted in: Conflicting.
Can we include red tick mark if pull is completed but Conflicting ?
added a third state to handle conflicted, failed merge, and "not supported" merge results.
Implemented - now able to identify that the Push is not successful with the "Conflicting" icon. Verified in 10.0.0-rc-13_17
Implemented - now able to identify that the Push is not successful with the "Conflicting" icon. Verified in 10.0.0-rc-13_17
Issue #6081 |
Closed |
Fixed |
Resolved |
Completion |
No due date |
Fixed Build 10.0.0-rc-13_17 |
No time estimate |
added a third state to handle conflicted, failed merge, and "not supported" merge results.