Eclipse Community Forums: EGit / JGit » Switching Branches after Refactoring

Home » Eclipse Projects » EGit / JGit » Switching Branches after Refactoring(Can't switch branches because it's complaining about uncommitted changes.)

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

Switching Branches after Refactoring [message #1819043]

Mon, 06 January 2020 08:11

Mik Clarke

Messages: 1
Registered: January 2020

Junior Member

I wanted to do some fairly major refactoring for a project, so I created a new branch and used a combination or Refactor, drag drop and copy/paste to restructure my packages so things were how I wanted them. Rework the build to use a pure ant build as well, produce a number of extra build artifacts int he process.

All worked well.

Then I switched back to my original branch to do some work with the older version of the code. As a minor issue, I noted that my new build artificats were still present - and clean didn't seem to get rid of them.

The real problem comes when I try and switch back to be refactored branch. I keep getting a dialog saying that there are uncommitted changes (there aren't any). Selecting 'discard changes' just brings the dialog back up. Selecting cancel just cancels the switch.

How do I get back to my new branch?

I did find something in the forums that suggested deleting the refactored files - but they are supposed to be in the branch I'm in at the moment - and they have been moved and renamed in the refactored branch I can't get into.

Any ideas?

Report message to a moderator

Re: Switching Branches after Refactoring [message #1819185 is a reply to message #1819043]

Thu, 09 January 2020 16:16

Matthias Sohn

Messages: 1176
Registered: July 2009

Senior Member

Which version do you use ?

EGit only keeps track of versioned files when you switch to another branch.

Try to run git clean -xffd from the command line to remove all non-versioned files.
Can also be run from EGit in repositories view.

Report message to a moderator

Previous Topic:	Failing to upload repo to github using eclipse 201912 -SSL protocol_version
Next Topic:	Can you and how to connect to azure devops git supported?

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Mon Jun 14 19:38:10 GMT 2021

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter