git push cancelled
Answered
Hello,
after resolving a merge conflict in IntelliJ Idea when clicking on the Apply - button of the merge window the push is cancelled with the message: "Push has been cancelled, because there were conflicts during update. Check that conflicts were resolved correctly, and invoke push again."
- Why was the push cancelled? It should have been successful since the merge conflict was resolved.
- How would the developer know later that a push was not successful sind no changes are displayed anymore. Technically it is not a real problem since the merged file would be pushed with the next push being executed. However, if developerB changes the file again and pushed it then developerA again will have a merge conflict because his own changes haven't been pushed.
Regards,
Jainar
Please sign in to leave a comment.
Push is canceled, because usually after conflicts are resolved, a developer wants to run tests and other validation. See https://youtrack.jetbrains.com/issue/IDEA-87116
As for the 2, could you please clarify? What changes do you expect to be displayed? A notification appears saying that push was canceled, isn't it enough?