|Re: Resolve conflicts with egit: Files marked as untracked in the Unestaged Changes [message #1772166 is a reply to message #1772085]
||Wed, 06 September 2017 08:59
| Thomas Wolf
Registered: August 2016
I don't know; I've never seen this happening. What Eclipse and EGit/JGit version is this? What exactly are you doing: rebase or merge?|
Is the repository on which this occurred public, and can you give precise steps (what to checkout, what to modify, commit, merge/rebase) to reproduce this? If the repo is not public, would it be possible that you could reproduce this with a small test repo that you could share?
What does the repository state show (for instance the project label in the project explorer)?
As work-arounds for your current problem state, there's a few things I'd try:
- Refresh the staging view.
- Open the file and search for the conflict markers in the file ("<<<<<<<", "=======", ">>>>>>>") and resolve the conflict manually, then save.
- Abort the rebase, or do a reset hard to the state before the merge, and re-try.
Powered by FUDForum
. Page generated in 0.01991 seconds