search results

  1. eGit merge conflict - wrong content in ... then the comparison ... Is this simply a visual bug when you use MergeTool to \'resolve\' a staged file (since the merge was ...
    stackoverflow.com/questions/15272474/​egit-merge-conflict... - Cached
  2. So we\'re stuck with EGit. ... in an unrelated file; Then do the merge; ... eGit merge conflict - wrong content in comparison for staged file. 1.
    stackoverflow.com/.../egit-how-to-​prevent-fast-forward-merge - Cached
  3. conflict - A merge conflict exists for the file. ... changes in comparison\" also local, not yet staged changes and the ... EGit does not check the content to decide ...
    wiki.eclipse.org/EGit/User_Guide - Cached
  4. staged - The resource has ... conflict - A merge conflict exists for the file. ... As a manual workaround you can view the content of the file after your last ...
    wiki.eclip se.org/EGit/User_Guide/State - Cached
  5. conflict - A merge conflict exists for the file ... changes in comparison\" also local, not yet staged changes and the ... EGit does not check the content to decide ...
    help.eclipse.org/indigo/topic/​org.eclipse.egit.doc/help/... - Cached
  6. ... (e.g. you forgot to commit a file) or your commit message was wrong, ... will turn into staged icons. EGit ... Any file where the merge result caused a conflict.
    eclipsesource.com/blogs/tutorials/egit-​tutorial - Cached
  7. conflict - A merge conflict exists for the file ... and also already staged changes will be shown in comparison ... EGit does not check the content to decide if a ...
    help.eclipse.org/helios/topic/​org.eclipse.egit.doc/help/... -     Cached
  8. ... Git always just duplicates a file\'s content between these annoying conflict ... on the file in the staged view ... merge when Egit thinks the entire file ...
    www.eclipse.org/forums/index.php/t/​366456 - Cached
  9. ... if you\'ve got conflicts during merge, you can run conflict resolving ... and perform comparison. To scroll the content of ... (autoload \'egit-file \"egit ...
    alexott.net/en/writings/emacs-vcs/​EmacsGit.html - Cached
  10. Is there any known conflict between Subversive and Egit? ... If a file has both staged and ... So if you import in the wrong way you can get yourself in a ...
    www.eclipse.org/forums/index.php/t/​488306 - Cached