Skip to main content

Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » eGit: replace does nothing for conflict files(replace error failure no-op)
eGit: replace does nothing for conflict files [message #1796244] Mon, 08 October 2018 19:57 Go to next message
J Smith is currently offline J SmithFriend
Messages: 1
Registered: October 2018
Junior Member
eGit has always had problems showing files as changed when there are no changes. Fine.

But this time when I try replacing with anything, it does nothing: doesn't unmark them as being in conflict, doesn't remove them from the list... nothing.


P.S. Why does it list files in conflict when I'm merging in versions obviously far later than the ones in the current branch?
Re: eGit: replace does nothing for conflict files [message #1796429 is a reply to message #1796244] Fri, 12 October 2018 18:29 Go to previous message
David M. Karr is currently offline David M. KarrFriend
Messages: 624
Registered: July 2009
Senior Member
From what I understand, egit will indicate that particular files have a merge conflict, but the only way it can tell if you've resolved the merge conflict is if you tell it you have. The way you indicate that is by moving the file to the staged files list. That leaves it up to you to actually resolve the merge conflict.
Previous Topic:Running a Local Language Server in a Docker Container
Next Topic:Git submodules vulnerability
Goto Forum:

Current Time: Thu Feb 20 14:16:24 GMT 2020

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

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

Back to the top