|Resolving conflicts in "Pre-merged by git" mode [message #1814098]
||Tue, 03 September 2019 15:39
| Julien Bittard
Registered: August 2019
I use Eclipse 2019-06, and plugin egit 4.5.2 on windows 10, and I have a question about conflict management, especially about recording the conflict resolution.
I set in the Team-> git menu, "Merge tool content" with "Workspace (pre-merged by Git)".
When I have to solve a conflict during a merge or a cherry-pick, I open the conflicting file in the merge tool, I edit the left part, I save, and I mark the conflict as set adding it to the list of files to commit (staging view).
But in fact, my changes have not been taken into account. I have to open the file in "normal" mode (Open working tree version) and save the file (without making any other changes.): indeed Eclipse detects unsaved changes.
And from there my changes are taken into account and I can add the file to commit.
Is this operation normal? or is there a parameter that I must activate to avoid making this double recording?
Powered by FUDForum
. Page generated in 0.02624 seconds