Open karthiksriramuoa opened 6 years ago
@karthiksriramuoa What is the current behavior of visualGit when pushing to a repo with conflicts?
@softeng-701 All the changes get overwritten with the changes in the existing file.
@karthiksriramuoa Approved
Feature Request
Currently, there is no functionality which intimates the user about any merge conflicts made to a file.
Scenario - A team member p1 has made a change to a file and committed to the repository. Simultaneously another team member, p2 is working on the same file and trying to commit.
Expected Behavior - The team member p2, however, must be able to edit the file but when trying to commit should be intimated of the conflicts. The team member can only commit the file if he resolves the conflict and chooses to either merge or discard his changes.
It would be very helpful to have this feature since its an integral feature of a team collaboration tool.