Eclipse Community Forums: EGit / JGit » Incorrect Merge by EGIT

Help

Home

Home » Eclipse Projects » EGit / JGit » Incorrect Merge by EGIT(Incorrect Merge by EGIT)

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

Incorrect Merge by EGIT [message #1743455]

Thu, 15 September 2016 14:35

Shivam Shukla

Messages: 1
Registered: September 2016

Junior Member

When I am merging the remote branch into local branch using EGIT, few lines of code are being automatically deleted. The deleted lines are present in the latest commits in both the branches.
However, performing the same operation using terminal (git merge command), the repository correctly goes into conflicting state and the same file is shown to be conflicting.

I am using git version 1.7 and EGIT version 4.2 on Centos 6.7

Is this a known issue or an usage problem?

Report message to a moderator

Re: Incorrect Merge by EGIT [message #1743520 is a reply to message #1743455]

Fri, 16 September 2016 07:44

Christian Halstrick

Messages: 274
Registered: July 2009

Senior Member

There have been bugs like that reported 6 years ago [1]. These specific problems are solved ... but maybe you have detected new ones. Do you have a reproducable setup where you can show this behaviour. Ideal would be something like: in the publicly available git repo xyz if I merge <x> into <y> I don't see conflicts which native git report.

[1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=328841

Ciao
Chris

Report message to a moderator

Previous Topic:	List stash apply conflicts in JGit
Next Topic:	"Add to index" triggers entire workspace refresh?

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Thu Apr 25 08:30:47 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter