egit

Merge conflicting pull request

Tag(s):

  1. Right-click on you project, Team->Pull...
  2. Add New Remote... Reference=master, When pulling=Merge.
  3. Click on Finish.

.gitignore already committed files

Tag(s):

  1. Right-click on your project name.
  2. Open Team->Advanced->Clean.
  3. Select Clean selected untracked files.
  4. Check Include ignored resources.
  5. Select files you like to remove.
  6. Click on Finish button.

Update submodule

Tag(s):

  1. On Git perspective, right-click on your submodule and then select Switch To master.
  2. Fetch from Upstream.
  3. Then, Rebase.

Egit: Remove git commit

Tag(s):

  1. Right-click on your project name.
  2. Go to Team->Show in History.
  3. Select the last good commit that you want.
  4. Right-click and select Reset->Hard (HEAD, Index, and working Directory).

http://stackoverflow.com/questions/13534336/how-to-delete-commits-with-egit#13797416

Eclipse: Resolve DIRTY_WORKTREE

Tag(s):

  • Right-click on your project.
  • Select Team -> Synchronize workspace.
  • You will then see conflicting files marked with a special icon.
  • Open the conflicting file and make all your changes.
  • Right-click on the file and select Mark as Merged.
  • Right-click on the your project and select Merge.
  • Right-click on the your project and select Team->Push to Upstream.

Regenerate ./git/index

Tag(s):

  1. Right-click on the project.
  2. Select Team->Add to Index.

egit rejected non-fast-forward

This might not be the right way to do it but it removes the error message.

  1. Right-click on your project.
  2. Select Team->Synchronize Workspace.
  3. Go through the compare view of each file and then update your local file accordingly.
  4. Then, right-click on the file, click on Marked as Merged.
  5. Back to project view, right-click on your project and select Team->Merge.
  6. Right-click on your project and select Team->Push to Upstream.

Change EGit repository URL

Tag(s):

  1. Open Git perspective.
  2. Right-click on your repository.
  3. Select Properties.
  4. Select Configuration.
  5. Scroll to remote key.
  6. Edit entry origin->url.
Subscribe to RSS - egit