How to resolve conflicts in EGit

Question

I am using EGit on Eclipse nbsp v4 3  Kepler   I want to commit and push my changes  I do a pull first and one file is conflicting  After manually resolving the conflict  local and remote are the same now   I am still running into problems   Here are the error messages for each action   Push to upstream     master  master  rejected - non-fast-forward    Pull     Cannot pull into a repository with state  MERGING RESOLVED   Mark as merged     Failed to add resource to index Failed to add resource to index Exception caught during execution of add command   Hard reset     An internal error occurred during   Resetting to refs heads master     Exception caught during execution of reset command   0    How can I remove the conflict and push my changes  What am I doing wrong

User · Answer

An earlier process of resolving conflicts (through the staging view) in Eclipse seemed much more intuitive several years ago, so either the tooling no longer functions in the way that I was used to, or I am remembering the process of resolving merge conflicts within SVN repositories. Regardless, there was this nifty "Mark as Merged" menu option when right-clicking on a conflicting file.

Fast forward to 2019, I am using the "Git Staging" view in Eclipse (v4.11). Actually, I am using STS (Spring Tool Suite 3.9.8), but I think the Git Staging view is a standard Eclipse plugin for working with Java/Spring-based projects. I share the following approach in case it helps anyone else, and because I grow weary or resolving merge conflicts from the GIT command line. ;-)

Because the feature I recall is now gone (or perhaps done differently with the current version of GIT and Eclipse), here are the current steps that I now follow to resolve merge conflicts through Eclipse using a GIT repository. It seems the most intuitive to me. Obviously, it is clear from the number of responses here that there are many ways to resolve merge conflicts. Perhaps I just need to switch to JetBrains IntelliJ, with their three-way merge tool.

Double-click on the offending file
A "Text Compare" interface appears, with side-by-side views of the conflicting commits.
Identify which view is the local state of the file, or the most recent commit.
Make changes to the local window, either adding or redacting the changes from the offending commit.
When the desired set of changes has been reviewed and updated, right-click on the unstaged file.
Click the "Add to Index" option, and your file will be added to the staged changes.
This also removes the conflicting file from the unstaged list, thus indicating that it has been "marked as merged"
Continue this process with each additional file in conflict.
When you have reivewed all conflicting files, confirm that all desired files (including additional changes) are staged.
Add an appropriate commit message.
Commit and push the "merged" files to the origin repository, and this officially marks your files as merged.

NOTE: Because the menu options are not intuitive, a number of things can be misleading. For example, if you have saved any updates locally, and try to reopen the conflicting file to confirmand that the changes you made have persisted, confusion may result since the original conflict state is opened... not your changes.

But once you add the file(s) to the index, you will see your changes there.

I also recommend that when you pull in changes that result in a merge conflict, that you "stash" your local changes first, and then pull the changes in again. At least with GIT, as a protection, you will not be allowed to pull in external changes until you either revert your changes or stash them. Discard and revert to the HEAD state if the changes are not important, but stash them otherwise.

Finally, if you have just one or two files changing, then consider pulling them into separate text files as a reference, then revert to the HEAD and then manually update the file(s) when you pull changes across.

User · Answer

As it s an issue we face more than often  below are the steps to resolve it    Open the Git perspective  In the Git Repository view  go to on Branches   Local   master and right click   Merge    It should auto select Remote Tracking    origin master  Press Merge  Launch stage view in Eclipse  Double click the files which initially showed conflict In the conflict merge view  by selecting the left arrow for all the non-conflict   conflict changes from left to right  you can resolve all the conflicts  Save the merged file  Do a Team   pull from Eclipse again    You are all set

User · Answer

This guide was helpful for me http   wiki eclipse org EGit User Guide Resolving a merge conflict   UPDATED Just a note on that about my procedure  this is how I proceed    Commit My change Fetch  Syncrhonize workspace  Pull Manage Conflicts with Merge Tool  Team- Merge Tool  and Save Add each file to stage  Team -  Add to index  Now the Commit Message in the Stage window is prefilled with  Merged XXX   You can leave as it is or change the commit message Commit and Push   It is dangerous in some cases but it is very usefull to avoid to use external tool like Git Extension or Source Tree

User · Answer

Are you using the Team Synchronise view  If so that s the problem  Conflict resolution in the Team Synchronise view doesn t work with EGit  Instead you need to use the Git Repository view   Open the Git perspective  In the Git Repository view  go to on Branches   Local   master and right click   Merge     It should auto select Remote Tracking   origin master  Press Merge   It should show result conflict   Open the conflicting files  They should have an old sk000l             lt  lt  lt  lt  style merge conflict in the files  Edit the file to resolve the conflict  and save   Now in the  Git Staging  view  it should show the changed file in  Unstaged Changes   Right click and  Add to Index     Repeat for any remaining files   Now from the  git staging  view  commit and push  As Git Eclipse now knows that you have merged the remote origin changes into your master  you should avoid the non-fast-forward error

User · Answer

This approach is similar to  stash  solution but I think it might be more clear    Your current local branch is  master  and you have local changes  After synchronizing  there are incoming changes and some files need to be merged  So  the first step is to switch to a new local branch  say  my changes      Team -  Switch To -  New branch   Branch name  my changes  for example    After switching to the new branch  the uncommitted local changes still exist  So  commit all your local uncommitted changes to the new branch  my changes   Switch back to the local  master  branch    Team -  Switch To -  master  Now  when you choose Team -  Synchronize Workspace  no  merge  files are expected to appear  Select Team -  Pull   Now the local  master  branch is up to date with respect to the remote  master  branch   Now  there are two options    Option 1    Select Team -  Merge to merge the original local changes from  my changes  local branch into  master  local branch  Now commit the incoming changes from the previous step into the local  master  branch and push them to the remote  master  branch   Option 2    Switch again to  my changes  local branch  Merge the updates from the local  master  branch into  my changes  branch  Proceed with the current task in  my changes  branch  When the task is done  use Option 1 above to update both the local  master  branch as well as the remote one

User · Answer

I know this is an older post  but I just got hit with a similar issue and was able to resolve it  so I thought I d share    Update  As noted in the comments below  this answer was before the inclusion of the  git stash  feature to eGit    What I did was    Copy out the local copy of the conflicting file that may or may not have any changes from the version on the upstream  Within Eclipse   Revert  the file to the version right before the conflict  Run a  Pull  from the remote repository  allowing all changes to be synced to the local work directory   This should clear the updates coming down to your filesystem  leaving only what you have left to push  Check the current version of the conflicting file in your work directory with the copy you copied out   If there are any differences  do a proper merge of the files and commit that version of the file in the work directory  Now  Push  your changes up    Hope that helps

User · Answer

Just right click on a conflicting file and add it to the index after resolving conflicts

User · Answer

To resolve the conflicts  use Git stash to save away your uncommitted changes  then pull down the remote repository change set  then pop your local stash to reapply your uncommitted changes   In Eclipse nbsp v4 5  Mars  to stash changes  a relatively recent addition  wasn t in previous EGit  I do this  right-click on a top-level Eclipse project that s in Git control  pick Team  pick Stashes  pick Stash Changes  a dialog opens to request a stash commit message   You must use the context menu on a top level project  If I right click on a directory or file within a Git-controlled project I don t get the appropriate context menu

User · Answer

GIT has the most irritating way of resolving conflicts  Unlike svn where you can simply compare and do the changes   I strongly feel git has complex conflict resolution process  If I were to resolve  I would simply take another code from GIT as fresh  add my changes and commit them  It simple and not so process oriented

User · Answer

I also find it confusing to resolve merge conflicts in EGit  When I am ready to commit some changes to a shared repository  the steps I have learned are as follows    Right click on the project and choose Team  Commit     Review my changes to check that I m not committing any changes I made accidentally or unrelated changes that I forgot about  Write up the commit message while I m reviewing the changes  I m optimistic  so I start by clicking the Commit and Push button  If no one else has pushed any changes  I m done  If someone has  then the commit succeeds  and the push gets rejected  Right click on the project and choose Team  Pull  If there are no conflicts  then choose Team  Push to Upstream and I m done  If there are conflicts  look through the package explorer to see which files are conflicted  Right click on each conflicted file  and choose Team  Merge Tool  It will show all the changes in both versions of the file  with any conflicts shown in red  Click on the button to merge all non-conflict changes  then edit any red sections manually  There s also a button to show a three way merge that includes the common ancestor  Save the changes to the file  If you want  you can compare it to HEAD to see what changes you are making on top of the changes you just pulled  Right click on the file and choose Team  Add to Index to tell EGit that you ve finished merging that file  To me  this is the least intuitive step  but the git command line also uses the add command to show that a merge is finished  Repeat for any other conflicted files  When all the files are merged  right click on the project and choose Team  Rebase  Continue Rebase  If there are more conflicted commits  go back to dealing with conflicts  When the rebase is complete  run your tests to see that the rebase didn t break anything  Right click on the project and choose Team  Push to Upstream

[eclipse] How to resolve conflicts in EGit

Examples related to eclipse

Examples related to git

Examples related to egit