The intuitive UI for IntelliMerge, where the developers can merge code and resolve conflicts.
Geek Repo:Geek Repo
Github PK Tool:Github PK Tool
Symbolk opened this issue 5 years ago · comments
Integrate through git subcommand: git imerge (call the GUI exe, Nodejs child_process exec jar with input branches, merge only Java files, other files are merged with Git, conflict mappings saved in temp file)