Supporting Merge Conflict Resolution by Using Fine-Grained Code Change History

Yuichi Nishimura, Katsuhisa Maruyama. Supporting Merge Conflict Resolution by Using Fine-Grained Code Change History. In IEEE 23rd International Conference on Software Analysis, Evolution, and Reengineering, SANER 2016, Suita, Osaka, Japan, March 14-18, 2016. pages 661-664, IEEE, 2016. [doi]

@inproceedings{NishimuraM16,
  title = {Supporting Merge Conflict Resolution by Using Fine-Grained Code Change History},
  author = {Yuichi Nishimura and Katsuhisa Maruyama},
  year = {2016},
  doi = {10.1109/SANER.2016.46},
  url = {http://doi.ieeecomputersociety.org/10.1109/SANER.2016.46},
  researchr = {https://researchr.org/publication/NishimuraM16},
  cites = {0},
  citedby = {0},
  pages = {661-664},
  booktitle = {IEEE 23rd International Conference on Software Analysis, Evolution, and Reengineering, SANER 2016, Suita, Osaka, Japan, March 14-18, 2016},
  publisher = {IEEE},
  isbn = {978-1-5090-1855-0},
}