Eclipse Community Forums: EGit / JGit » Resolve conflict without changes

Home » Eclipse Projects » EGit / JGit » Resolve conflict without changes(Resolve conflict without changes)

Resolve conflict without changes [message #1699941]

Mon, 29 June 2015 08:32

Eclipse User

I'm trying to fix a (supposedly) simple problem. I have a file in conflict and to fix it I change its content, add it to index and then commit the changes. It works nicely when there are real changes. But when I want to keep my file content untouched it doesn't work. If I just remove the conflict marks, Jgit throws this exception:

org.eclipse.jgit.api.errors.JGitInternalException: No changes

What am I doing wrong?

Re: Resolve conflict without changes [message #1699994 is a reply to message #1699941]

Mon, 29 June 2015 10:40

Eclipse User

Just to be clear: the same issue occurs in Eclipse. Just follow these steps:

1 - checkout a project;
2 - make a simple change and commit it;
3 - make a remote change that conflicts with the local one;
4- run the pull command to get the remote change;
5 - run the merge tool. It does nothing if you don't change anything, so make a change like cut and paste the same piece of code;
6 - save the file and add it to index;
7 - try to commit the file. Eclipse won't list it, since there is no real change, but it should have a change to represent the "marged" state;
8 - try to push to upstream. Now you have a "MERGING_STATE" issue to deal with.

What's wrong with these steps?

[Updated on: Mon, 29 June 2015 10:41] by Moderator

Previous Topic:	Commit compare layout issues
Next Topic:	Project layout to avoid full rebuild after switching branches

Goto Forum:

-=] Back to Top [=-

Current Time: Sat Jul 19 05:33:53 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter