Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detect diff & merge softwares installed on the developer's workstation and execute them for the approval merge #3

Open
16 of 23 tasks
aneveux opened this issue Feb 26, 2018 · 0 comments
Assignees
Milestone

Comments

@aneveux
Copy link
Member

aneveux commented Feb 26, 2018

When computing the approval tests and facing an empty or different approved file, the framework should allow merge tools to be executed automatically to review and validate the outputs of the program.

This feature should work on any OS, and here's the first list of supported tools to look for:

Windows support

  • IntelliJ IDEA diff tools
  • GVim
  • KDiff 3
  • Beyond Compare 3
  • Beyond Compare 4
  • TortoiseIDiff
  • TortoiseMerge
  • WinMergeU
  • Araxis Merge
  • Code Compare

Linux support

  • IntelliJ Ultimate IDEA diff tools
  • Beyond Compare
  • IntelliJ Community IDEA diff tools
  • GVim
  • KDiff 3

Mac OS X support

  • IntelliJ IDEA diff tools
  • KDiff 3
  • GVim
  • DiffMerge
  • Beyond Compare
  • Kaleidoscope
  • p4merge
  • tkdiff

See legacy implementation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants