What do the egit merge modes mean?

I am doing a rebase with egit and there is a conflict egit popus up the following dialog box
enter image description here

It is not clear to me what these two options. My questions are.

  • Egit's Team context menu has only one option: Apply patch
  • Eclipse Git nested repositories not found
  • SVN - how does removing a bin folder cause the src folder to be removed instead?
  • Eclipse “Error: Could not find or load main class”
  • How do I make a Scala project “Import from git”able in Eclipse?
  • I just installed EGit on Eclipse — but Where is it?
    • What do these options really mean?
    • Under what circumstances would I choose one option over the other?
    • Which HEAD does head refer to the HEAD of the branch I am rebasing on or the head of the branch I am rebasing?
    • What do these merge modes correspond to in the command line version of egit?

  • Git Merge branch 'master' of https://bitbucket.org/xxx/yyy
  • How to set Subversion properties with git-svn
  • Is there any way to get git to work directly with a .pac (proxy auto-config) script?
  • Accessing Teamcity git Change log in a build step
  • Setting up CI with TeamCity with Git & NAnt
  • In Git, how do I get a detailed list of file changes from one revision to another?
  • One Solution collect form web for “What do the egit merge modes mean?”

    The different modes are specific to Eclipse, and have no corresponding merge mode in command line. The difference between the modes is the following:

    1. If you use the workspace version, an editor will open with a single file containing all elements (both added and removed) in a single file, as the default git merge would do it. This is useful if there is no compare editor available for your file type.
    2. Using HEAD you can get a compare editor, where both your branches and the merged branches HEADS are displayed side-by-side, allowing merging using the Eclipse compare editor.

    As I am using EGit with Java projects, the HEAD version option makes more sense to me; I believe, the other option is only there for some very specific reasons.

    Git Baby is a git and github fan, let's start git clone.