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 - pull= failled and no conflicts
  • embed version details in android APK
  • 'cannot open git-upload-pack' error in Eclipse when cloning or pushing git repository
  • Package contains object and package with same name
  • Eclipse SVN Synchronze workspace error - Updating Synchronize view for SVN Workspace - java/nio/file/Paths
  • Do not run a category of slow JUnit tests by default in Maven and every IDE (Eclipse, IntelliJ, …) without an explicit TestSuite
    • 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?

  • Subclipse- update working copy
  • Git: merge all changes from another branch as a single commit
  • What is the best way to git patch a subrange of a branch?
  • Proper Git workflow for combined OS and Private code?
  • With dvcs/git, is a single commit preferred over multiple, small, thematic commits?
  • how do I sync my repository to both GitHub and my internal Git server?
  • 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.