Dear CHOOSE members, It is my pleasure to invite you to the upcoming SIG Beer talk on "Code Merging" that will be given by Prof. Stephane Ducasse in Bern, on February 17. If you plan to attend, please register for the event at: http://choose.s-i.ch/events/sig-beer-ducasse-codemerging . The talk will be followed by the traditional SIG Beer apero. Best Regards, Dr. Mircea Lungu Researcher Software Composition Group University of Bern -- TITLE: Supporting Code Merging: Torch and Jet SPEAKER: Stephane Ducasse ABSTRACT: Merging code is an important activity and a challenging one. Up until now tools are simply showing diff between versions. In the best case, three ways merge is applied. In this presentation we will present Torch an approach to visually characterize a change. Torch provides information such as size, location, modification/addition/deletion of the changes in the context of the system. Another problem when dealing with changes is that we should often understand a change within a stream of changes. Jet provides analysis to understand and query streams of changes. A dependency model between changes is computed and the programmer can use the classification of the changes to drive his analysis. Both Torch and Jet are based on the Ring metamodel and are the work of Veronica Uquillas-Gomez from the VUB. TIME: February 17, 2012, 5.30pm LOCATION: Room 107 SCG, IAM, University of Bern Schützenmattstrasse 14 http://scg.unibe.ch/contact/maps -- Dr. Mircea Lungu Researcher Software Composition Group University of Bern