We can work it out: Collaborative conflict resolution in model versioning

ECSCW 2009 - Proceedings of the 11th European Conference on Computer Supported Cooperative Work

Volumn , Issue , 2009, Pages 207-214

  Brosch, Petra ^a   Seidl, Martina ^a   Wieland, Konrad ^a   Wimmer, Manuel ^a   Langer, Philip ^b  

^a VIENNA UNIVERSITY OF TECHNOLOGY   (Austria)

^b JOHANNES KEPLER UNIVERSITY LINZ   (Austria)

Author keywords

[No Author keywords available]

Indexed keywords

INTERACTIVE COMPUTER SYSTEMS; MERGING; SEMANTICS;

CONFLICT RESOLUTION; ERROR PRONE TASKS; GRAPH STRUCTURES; STANDARD SYSTEM; VERSION CONTROL SYSTEM; VERSIONING; VERSIONING SYSTEMS;

SOFTWARE DESIGN;

EID: 79956321467     PISSN: None     EISSN: None     Source Type: Conference Proceeding    
DOI: 10.1007/978-1-84882-854-4_12     Document Type: Conference Paper

References (8)

1. Altmanninger, K., G. Kappel, A. Kusel,W. Retschitzegger, M. Seidl,W. Schwinger, and M.Wimmer (2008): 'AMOR-Towards Adaptable Model Versioning'. In: Proc. of the 1st International Workshop on Model Co-Evolution and Consistency Management.
2. Barrett, S., P. Chalin, and G. Butler (2008): 'Model Merging Falls Short of Software Engineering Needs'. In: Proc. of the 2nd Workshop on Model-Driven Software Evolution.
3. Bézivin, J. (2005): 'On the Unification Power of Models'. Journal on Software and Systems Modeling, vol. 4, no. 2, pp. 171-188.
4. Dewan, P. and R. Hegde (2007): 'Semi-synchronous conflict detection and resolution in asynchronous software development'. In: Proc. of the 10th European Conference on Computer-Supported Cooperative Work. pp. 159-178, Springer.
5. Dewan, P. and J. Riedl (1993): 'Toward Computer-Supported Concurrent Software Engineering'. IEEE Computer, vol. 26, no. 1, pp. 17-27.
6. Fitzpatrick, G., P. Marshall, and A. Phillips (2006): 'CVS integration with notification and chat: lightweight software team collaboration'. In: Proc. of the 2006 ACM Conference on Computer Supported Cooperative Work. pp. 49-58, ACM.
7. France, R. B. and B. Rumpe (2007): 'Model-driven Development of Complex Software: A Research Roadmap'. In: Proc. of the 29th International Conference on Software Engineering. pp. 37-54, IEEE Computer Society.
8. Mens, T. (2002): 'A State-of-the-Art Survey on Software Merging'. IEEE Transactions on Software Engineering, vol. 28, no. 5, pp. 449-462.