How we resolve conflict: an empirical study of method-level conflict resolution

Ryohei Yuzuki, Hideaki Hata, Ken-ichi Matsumoto. How we resolve conflict: an empirical study of method-level conflict resolution. In Olga Baysal, Latifa Guerrouj, editors, 1st IEEE International Workshop on Software Analytics, SWAN 2015, Montreal, QC, Canada, March 2, 2015. pages 21-24, IEEE, 2015. [doi]

@inproceedings{YuzukiHM15,
  title = {How we resolve conflict: an empirical study of method-level conflict resolution},
  author = {Ryohei Yuzuki and Hideaki Hata and Ken-ichi Matsumoto},
  year = {2015},
  doi = {10.1109/SWAN.2015.7070484},
  url = {http://dx.doi.org/10.1109/SWAN.2015.7070484},
  researchr = {https://researchr.org/publication/YuzukiHM15},
  cites = {0},
  citedby = {0},
  pages = {21-24},
  booktitle = {1st IEEE International Workshop on Software Analytics, SWAN 2015, Montreal, QC, Canada, March 2, 2015},
  editor = {Olga Baysal and Latifa Guerrouj},
  publisher = {IEEE},
}