MergeHelper: A Tool Supporting Merge Conflict Resolution

Published in this paper “Supporting Merge Conflict Resolution by Using Fine-Grained Code Change History” presented at the SANER 2016 Tool Track.

Merge Conflict Example

Tool Demo

MergeHelper is Eclipse-plugin, you can download from here: plugins, source code

Contact

• Nishimura Yuichi & Katsuhisa Maruyama, Ritsumeikan University, Japan
  Email: mergehelper@fse.cs.ritsumei.ac.jp