Eclipse Community Forums: EGit / JGit » Compare versions of a file before merging

Home » Eclipse Projects » EGit / JGit » Compare versions of a file before merging(How to see the changes in a file side by side)

Compare versions of a file before merging [message #1691385]

Mon, 06 April 2015 17:01

Eclipse User

I'm developing a git comparison tool integrated with another one developed by the company I work. I want to do pretty much what "team -> merge tool" does in Eclipse, i.e. comparing my last commit with the incoming one. I took a look at the EGit code but it's very complex for what I need.
In svn it's pretty easy because it creates two files (the old and the new versions), but in git it's necessary to get the information somewhere.

[Updated on: Mon, 06 April 2015 17:02] by Moderator

Re: Compare versions of a file before merging [message #1691659 is a reply to message #1691385]

Wed, 08 April 2015 15:02

Eclipse User

Ok, it seems working if a use FETCH_HEAD as my remote change without forcing a new fetch. I achieved the "two side" merger. My merge tool only accepts that the user update their current version applying the new changes. But then, how do I say "my file is merged"?

Re: Compare versions of a file before merging [message #1691889 is a reply to message #1691659]

Fri, 10 April 2015 06:18

Eclipse User

In git you typically tell that "my file is merged" by adding new content to the index. JGits AddCommand helps you.

Previous Topic:	Egit shows differences that don't exist
Next Topic:	Import function: Git option not available

Goto Forum:

-=] Back to Top [=-

Current Time: Sat Nov 08 06:16:21 EST 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter