I have made some changes in qgis_style.tex that I need to commit. However, my copy does not include some changes that were made on 6/5 by sholl. How do I commit my changes without messing up the others? I assume this has something to do with merge, but I am not quite sure how to accomplish it. Thanks, Tara