International audienceModel merging conflicts occur when different stakeholders aim to integrate their contradicting changes that are applied concurrently to update software models. We conduct an extensive systematic mapping study on conflict management techniques and relevant collaboration attributes to the versioning and merging models from 2001 to the middle of 2021. This study follows the standard guidelines within the software engineering domain. We analyzed a total of 105 articles extracted from an initial pool of more than 1800 articles to infer a taxonomy for conflict management techniques. We use this taxonomy to classify existing approaches to understand characteristics, shortcomings, and challenges on conflict management techniqu...
Software branching and merging allows collaborative development and creating software variants, comm...
Specifying software requirements is an important, complicated and error prone task. It involves the ...
Developers are increasingly adopting Source Code Man-agement (SCM) systems with extensive support to...
International audienceModel merging conflicts occur when different stakeholders aim to integrate the...
International audienceVerifying the consistency of model merging is an important step towards the su...
Almost every kind of software development periodically needs to merge models. Perhaps they come from...
Collaborative software development is nowadays incon-ceivable without optimistic version control sys...
Version management of process models requires that different versions of process models are integrat...
Abstract. For the versioning of code a pantheon of version control system (VCS) solutions has been r...
SWAN 2015 : 2015 IEEE 1st International Workshop on Software Analytics, 2 March 2015, Montreal, QC, ...
Branching and merging are common practices in collaborative software development. They increase deve...
International audienceModeling is an activity in the software development life cycle in which differ...
Concurrent contributions to a code base may introduce merge conflicts. Whereas merge conflicts are e...
Model merging is an important activity in software development. We often need to integrate a set of ...
Abstract Conflict problem is one of the major issues in Collaborative CAD systems. Based on a flexib...
Software branching and merging allows collaborative development and creating software variants, comm...
Specifying software requirements is an important, complicated and error prone task. It involves the ...
Developers are increasingly adopting Source Code Man-agement (SCM) systems with extensive support to...
International audienceModel merging conflicts occur when different stakeholders aim to integrate the...
International audienceVerifying the consistency of model merging is an important step towards the su...
Almost every kind of software development periodically needs to merge models. Perhaps they come from...
Collaborative software development is nowadays incon-ceivable without optimistic version control sys...
Version management of process models requires that different versions of process models are integrat...
Abstract. For the versioning of code a pantheon of version control system (VCS) solutions has been r...
SWAN 2015 : 2015 IEEE 1st International Workshop on Software Analytics, 2 March 2015, Montreal, QC, ...
Branching and merging are common practices in collaborative software development. They increase deve...
International audienceModeling is an activity in the software development life cycle in which differ...
Concurrent contributions to a code base may introduce merge conflicts. Whereas merge conflicts are e...
Model merging is an important activity in software development. We often need to integrate a set of ...
Abstract Conflict problem is one of the major issues in Collaborative CAD systems. Based on a flexib...
Software branching and merging allows collaborative development and creating software variants, comm...
Specifying software requirements is an important, complicated and error prone task. It involves the ...
Developers are increasingly adopting Source Code Man-agement (SCM) systems with extensive support to...