Eclipse Community Forums: EGit / JGit » eGit: replace does nothing for conflict files

Help

Home

Home » Eclipse Projects » EGit / JGit » eGit: replace does nothing for conflict files(replace error failure no-op)

Show: Today's Messages :: Show Polls :: Message Navigator

eGit: replace does nothing for conflict files [message #1796244]

Mon, 08 October 2018 19:57

J Smith

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.

Why?

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?

Report message to a moderator

Re: eGit: replace does nothing for conflict files [message #1796429 is a reply to message #1796244]

Fri, 12 October 2018 18:29

David M. Karr

Messages: 801
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.

Report message to a moderator

Previous Topic:	Running a Local Language Server in a Docker Container
Next Topic:	Git submodules vulnerability

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Fri Apr 26 03:38:27 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter