Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » Resolving conflicts in "Pre-merged by git" mode(Obligation to save changes 2 times)
Resolving conflicts in "Pre-merged by git" mode [message #1814098] Tue, 03 September 2019 15:39 Go to next message
Julien Bittard is currently offline Julien BittardFriend
Messages: 20
Registered: August 2019
Junior Member
Hi,

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?

Thank You
Re: Resolving conflicts in "Pre-merged by git" mode [message #1814108 is a reply to message #1814098] Tue, 03 September 2019 21:08 Go to previous messageGo to next message
Thomas Wolf is currently offline Thomas WolfFriend
Messages: 174
Registered: August 2016
Senior Member
No, it's not normal. (Presumably you mean EGit 5.4.2, not 4.5.2.)

I cannot reproduce this behavior. What kind of files do you observe this behavior with? (Java, Php, ...?)
Re: Resolving conflicts in "Pre-merged by git" mode [message #1814109 is a reply to message #1814108] Tue, 03 September 2019 21:47 Go to previous messageGo to next message
Julien Bittard is currently offline Julien BittardFriend
Messages: 20
Registered: August 2019
Junior Member
Yes it's egit 5.4.2..
I have problem with different file types: java, sql, jsp.
Re: Resolving conflicts in "Pre-merged by git" mode [message #1814212 is a reply to message #1814109] Thu, 05 September 2019 19:41 Go to previous messageGo to next message
Thomas Wolf is currently offline Thomas WolfFriend
Messages: 174
Registered: August 2016
Senior Member
OK, can reproduce with Eclipse 2019-06. Cannot reproduce with Eclipse 2018-12. Both with latest EGit.

So something broke in the Eclipse compare framework.
Re: Resolving conflicts in "Pre-merged by git" mode [message #1814214 is a reply to message #1814212] Thu, 05 September 2019 21:17 Go to previous messageGo to next message
Julien Bittard is currently offline Julien BittardFriend
Messages: 20
Registered: August 2019
Junior Member
OK thanks for your answer.
Should I declare a bug on https://bugs.eclipse.org?

Thank You
Re: Resolving conflicts in "Pre-merged by git" mode [message #1814281 is a reply to message #1814214] Sun, 08 September 2019 14:27 Go to previous messageGo to next message
Thomas Wolf is currently offline Thomas WolfFriend
Messages: 174
Registered: August 2016
Senior Member
Correction: also reproduces with Eclipse 2018-12. Looks like a bug in EGit introduced when I did some refactoring for EGit 5.3.0. Interesting that it didn't get noticed earlier.

I've created bug 550870 for this. Not sure I can fix it in time for 5.5.0, but I'll try.
Re: Resolving conflicts in "Pre-merged by git" mode [message #1814283 is a reply to message #1814281] Sun, 08 September 2019 15:03 Go to previous messageGo to next message
Julien Bittard is currently offline Julien BittardFriend
Messages: 20
Registered: August 2019
Junior Member
ok, thanks a lot for looking and finding :)
I also hope that you can correct as soon as possible.
Re: Resolving conflicts in "Pre-merged by git" mode [message #1814395 is a reply to message #1814283] Tue, 10 September 2019 20:43 Go to previous messageGo to next message
Thomas Wolf is currently offline Thomas WolfFriend
Messages: 174
Registered: August 2016
Senior Member
Will be fixed in the upcoming EGit 5.5.0. (Release date 2019-09-18.)
Re: Resolving conflicts in "Pre-merged by git" mode [message #1814403 is a reply to message #1814395] Wed, 11 September 2019 04:13 Go to previous messageGo to next message
Julien Bittard is currently offline Julien BittardFriend
Messages: 20
Registered: August 2019
Junior Member
Yes I saw the tag on the bug Sheet. Thank You.
Is a 5.5.0 rc2 provided with this fix for me to test?
Re: Resolving conflicts in "Pre-merged by git" mode [message #1814581 is a reply to message #1814403] Fri, 13 September 2019 14:18 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 1105
Registered: July 2009
Senior Member
You can already install 5.5.0 from
https://repo.eclipse.org/content/unzip/releases.unzip/org/eclipse/egit/org.eclipse.egit.repository/5.5.0.201909110433-r/org.eclipse.egit.repository-5.5.0.201909110433-r.zip-unzip/
it will be published officially next Wednesday if no stop-ship bug for the Eclipse simultaneous release 2019-09 interferes
Re: Resolving conflicts in "Pre-merged by git" mode [message #1814643 is a reply to message #1814581] Sun, 15 September 2019 14:23 Go to previous message
Julien Bittard is currently offline Julien BittardFriend
Messages: 20
Registered: August 2019
Junior Member
Hi,

I confirm, the bug is fixed.

Thank You.
Previous Topic:How to authenticate
Next Topic:Git status very long since last release 5.4.2
Goto Forum:
  


Current Time: Sun Dec 08 02:18:21 GMT 2019

Powered by FUDForum. Page generated in 0.02624 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top