× Heads up!

Aqua Data Studio / nhilam

Follow
IDE for Relational Databases
×
tariqrahiman reported 2011-09-20T18:02:15Z  · last modified 2011-09-20T21:10:08Z

Update(Pull) - conflict dialog


Priority Major
Complexity Unknown
Component App - Version Control - GIT
Version 10.0

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 ?

2 attachments
  • 1.png

    2011-09-20T18:02:15Z

    20 KB

  • 2.png

    2011-09-20T18:03:57Z

    3 KB

Issue #6081

Closed
Fixed
Resolved 2011-09-20T19:06:20Z
 
 
Completion
No due date
Fixed Build 10.0.0-rc-13_17
No time estimate

About AquaClusters Privacy Policy Support Version - 19.0.2-4 AquaFold, Inc Copyright © 2007-2017