Integration with Version Control | ||
---|---|---|
![]() |
||
Difference resolution in a nutshell |
Eclipse maintains a local history of file modifications and allows to compare a file with a version from local history. For more information refer to the local history documentation
Eclipse provides mechanisms (Eclipse Team) that make interactions with Version Control Systems (VCSs) easier. VCS clients that integrate within Eclipse and use these mechanisms, for example EGit for Git or Subversive for SVN, can interact with EMF Diff/Merge in order to, e.g., compare well-identified versions, commits or branches, understand the content of a commit, or resolve conflicts when merging branches.
This can be achieved by
If this setup is successful, VCS-based features, for example those available through the 'Compare with...' contextual menu, will automatically use the EMF Diff/Merge GUI when appropriate. In the case of EGit, be careful to not directly use content that is pre-merged by Git (see Window - Preferences - Team - Git, 'Merge tool content': do not select 'Workspace').
![]() |
![]() |
|
Difference resolution in a nutshell |