W. F. Tichy, Rcs ??? a system for version control, Software: Practice and Experience, vol.2, issue.7, pp.637-654, 1985.
DOI : 10.1002/spe.4380150703

B. Berliner, Cvs ii: parallelizing software development, USENIX, pp.22-26, 1990.

D. B. Leblang and R. P. Chase, Computer-Aided Software Engineering in a distributed workstation environment, ACM SIGSOFT Software Engineering Notes, vol.9, issue.3, pp.104-112, 1984.
DOI : 10.1145/390010.808255

J. Buffenbarger, Syntactic software merging, Software Configuration Management, pp.153-172, 1995.
DOI : 10.1007/3-540-60578-9_14

U. Asklund, Identifying conflicts during structural merge, Nordic Workshop Programming Environment Research, 1994.

D. Binkley, S. Horwitz, and T. Reps, Program integration for languages with procedure calls, ACM Transactions on Software Engineering and Methodology, vol.4, issue.1, pp.3-35, 1995.
DOI : 10.1145/201055.201056

H. Shen and C. Sun, A complete textual merging algorithm for software configuration management systems, in COMPSAC, pp.293-298, 2004.

D. Dig, K. Manzoor, R. E. Johnson, and T. N. Nguyen, Effective Software Merging in the Presence of Object-Oriented Refactorings, IEEE Transactions on Software Engineering, vol.34, issue.3, pp.321-335, 2008.
DOI : 10.1109/TSE.2008.29

J. W. Hunt and M. D. Mcilroy, An algorithm for differential file comparison, 1976.

T. Lindhom, A 3-way merging algorithm for synchronizing ordered trees -the 3dm merging and differencing tool for xml, 2001.

D. Thomas and K. Johnson, Orwell ? A configuration management system for team programming, OOPSLA, pp.135-141, 1988.

R. Robbes, Of change and software, 2008.

P. Ebraert, First-Class Change Objects for Feature-Oriented Programming, 2008 15th Working Conference on Reverse Engineering, pp.319-322, 2008.
DOI : 10.1109/WCRE.2008.43

E. Lippe and N. Van-oosterom, Operation-based merging, ACM SIGSOFT Software Engineering Notes, vol.17, issue.5, pp.78-87, 1992.
DOI : 10.1145/142882.143753

P. Steyaert, C. Lucas, K. Mens, and T. D. Hondt, Reuse contracts: Managing the evolution of reusable assets, Proc. of OOPSLA '96, 1996.

N. Wilde and R. Huitt, Maintenance support for object-oriented programs, IEEE Transactions on Softw. Eng, issue.12, pp.1038-1044, 1992.

A. Colyer, A. Clement, G. Harley, and M. Webster, Eclipse aspectj: aspect-oriented programming with aspectj and the eclipse aspectj development tools, 2004.

M. Shonle, J. Neddenriep, and W. Griswold, AspectBrowser for Eclipse, Proceedings of the 2004 OOPSLA workshop on eclipse technology eXchange , eclipse '04, pp.78-82, 2004.
DOI : 10.1145/1066129.1066145

S. G. Eick, J. L. Steffen, S. Eric, and E. Jr, Seesoft-a tool for visualizing line oriented software statistics, IEEE Transactions on Software Engineering, vol.18, issue.11, pp.957-968, 1992.
DOI : 10.1109/32.177365

D. Zhang, E. Duala-ekoko, and L. Hendren, Impact analysis and visualization toolkit for static crosscutting in aspectj, ICPC, 2009.

M. Horie and S. Chiba, AspectScope: An Outline Viewer for AspectJ Programs., The Journal of Object Technology, vol.6, issue.9, pp.341-361, 2007.
DOI : 10.5381/jot.2007.6.9.a17

J. Pfeiffer and J. R. Gurd, Visualisation-based tool support for the development of aspect-oriented programs, Proceedings of the 5th international conference on Aspect-oriented software development , AOSD '06, pp.146-157, 2006.
DOI : 10.1145/1119655.1119676

W. Coelho and G. C. Murphy, Presenting crosscutting structure with active models, Proceedings of the 5th international conference on Aspect-oriented software development , AOSD '06, pp.158-168, 2006.
DOI : 10.1145/1119655.1119677

M. D. 'ambros, M. Lanza, and R. Robbes, Commit 2.0, Web2SE '10: Proc. of the 1st Workshop on Web 2.0 for Softw. Eng, pp.14-19, 2010.