How do developers resolve merge conflicts? an investigation into the processes, tools, and improvements.
Caius BrindescuPublished in: ESEC/SIGSOFT FSE (2018)
Keyphrases
- end users
- development processes
- resolving conflicts
- software developers
- development environments
- cooperative
- software engineers
- software engineering
- decision support
- software systems
- source code
- domain expertise
- building blocks
- process model
- software components
- visualization tools
- conflict resolution
- open source
- software tools
- tool support
- computational models
- user friendly
- software development
- graphical interfaces