Skip to content

EGit. Resolve conflicts

Jump to bottom Edit New page
Mikhail Niedre edited this page Aug 30, 2014 · 4 revisions

EGit User Guide. Resolving a merge conflict

To solve conficts, You should

  1. Open Git perspective

  2. Switch to Git Staging view

  3. Select unstaged changes and choose Add to git index in context menu

Egit rejected non-fast-forward

Add a custom footer
Add a custom sidebar
Clone this wiki locally