How to change merge mode for eclipse egit merge tool? - eclipse

We are working with Git and Eclipse. If I'm opening the merge tool to resolve a conflict I get this dialog:
I want to change this afer I marked Don't ask again before. But just cannot find the correct preference page.
Where can I change this after the dialog does not show up anymore?

You can change this in Eclipse Git preferences. Go to Window -> Preferences -> Team -> Git and there is dropdown for Merge Merge tool content.

Related

How to check out a specific tag with Egit?

Egit is a popular Eclipse plugin that integrates Eclipse with Git/GitHub.
With Git, if I want to work on a specific tag of a project, I clone that project and then run
git checkout tags/<tagName>
However, I don't see how I can do this with Egit. Any ideas?
Right click on the project Team -> Switch To -> Other.... Expand Tags, select desired tag, click Checkout button.

Eclipse Git Synchronize does not display changes

No matter what I do, Eclipse (EGit) doesn't display the changes. I've searched a lot for this issue, but cannot solve it. A friend of mine has the same issue. In the past everything worked fine, but from one day to the other the issue occured.
When I hit Team > Synchronize Workspace, only the dialog "Synchronizing Git: No changes found." appears. When I choose Team > Advanced > Synchronize, the same happens.
I also installed a new Eclipse (with a fresh Windows) and issue was still there. With my Ubuntu notebook everything is fine.
Does anybody have the same issue? Is there a solution? I also tried to install the plugins mentioned in this answer, but it didn't work for me.
Update
Eclipse also displays incoming changes (after fetching from upstream) and the changed files (with an arrow), but the synchronize view still doesn't show the changes.
Update 2 I've tested a project from Github and there everything works as apected. What could be the difference between these two projects? I've checked the repository settings and they are equal. Could the authentication cause the issues? Like I've said, the project works fine on my Ubuntu machine.
I've tried the new EGit, re-cloning the project and nothing worked except this:
In the Synchronize view, click on the dropdown arrow next to Synchronize button, then select "Synchronize...".
In the dialog that appears choose Git, press Next.
Then the crucial part - select destination to be HEAD for your repository and check "Include local uncommitted changes in comparison".
Click Finish.
I used to have the same problem but upgrading to EGit 2.2 seems to have taken care of it. Things are now consistent between "git status" at command line and "Team / Synchronize Workspace" in Eclipse.
You can get EGit from here or you can add the update site http://download.eclipse.org/egit/updates-2.2 to Eclipse.
Latest Egit Update Site:
http://download.eclipse.org/egit/updates
Before you can synchronize your workspace, you need to do a "fetch" from the remote repository (Team -> Fetch from Upstream) to get all the incoming changes into your local repository. Afterwards you can synchronize them.
If you don't want to make two clicks for synchronizing, you can enable "Always launch fetch before synchronisation" in Preferences -> Team -> Git -> Synchronize.
Staged ChangesThis has worked for me :
Whenever you made any changes. Right click on your Project name then Go to Team and click on "Add to Index". Now again Right click on your Project Name then Go to Team and click on "Commit". Now You will see that Git Staging console has been opened and the changes you have made are started displaying in Staged Changes box.
We were strugeling with the same problem. It turned out that we had to remove all options in Git->Synchronize preferences.
We are using Eclipse Juno and Kepler. Removing the options solved the problem for both.
If it helps anyone, I ran into the same problem.
During synchronization, in repository selection, the option Include local uncommitted changes in comparison is not checked and shows No changes found in the Synchronize view. Synchronizing with that option checked, shown the changes.
Eclipse Version: Luna Service Release 1 (4.4.1) - MacOS

egit does not show label decorations

I am a git beginner.
I have created a git repository with 4 eclipse projects.
A while I was committing and pushing with the git command.
After that, I installed EGit for eclipse. In "Git repository exploring" perspective I added an "existing local repository" and I am able to commit and push changes from this perspective.
The problem is that, in any persective, eclipse does not decorate labels according to Window -> Preferences -> Team -> Git -> Label Decorations. Or more directly said - I cannot see uncommited changes in the project tree.
Any suggestions? Thanks!
OK I just saw the answer here:
Eclipse and EGit
I had to manually add each of the eclipse projects right click -> Team -> Share -> Git -> Finish.
Why do these answers appear when you have just asked? :-)

How to force Eclipse's quick diff to refresh after a commit?

I'm using Subclipse 3.0.0 and set my quick diff settings to be against "Prestine SVN copy".
However when I make a commit using the menu option Team -> Commit I still see the old changes coloured in my left side ruller where the line numbers are.
Doing a Refresh on the source tree does not help either. I have to manually close all the opened source files and re-open them for the quick diff to update.
From what I see the reference "Prestine SVN copy" only gets updated when you open a file that is not currently opened. Is there any way to fix this?
In Eclipse, to do SVN clean up
Right Click on Project -> Team -> Refresh/Cleanup option
You also can refer to this to add a keyboard shortcut for this command

Display current branch name in Eclipse/Subclipse

I have a project set-up within Eclipse which is linked to our SVN repository using Subclipse. Is there a way to display the name of the current branch I'm in next to project. I'm sure I've seen this before but it's not there now and I can't find out how to switch this feature on anywhere. Hope you can help.
Thanks.
By default subclipse will present the current branch info (in square brackets) next to the project name inside the Package Explorer view.
This is customizable inside the Window -> Preferences window under the following location:
Team -> SVN -> Label decorations (Text tab) -> Project Format
If you somehow lost your default setting, here it is:
{dirty_flag}{name} [{url_short}]