2015-05-31 15:24 GMT+02:00 Georg Baum: > I want to merge the current status of the features/fix-tex2lyx-tests now to > master, but I am unsure how to do it. I could simply merge it with git, but > then the history of master would contain an ugly revert 201ee24d13 which is > partly undone by later commits. The other alternative would be to create 3 > completely separate commits in master with the contents of the attached > diffs, and simply view the fix-tex2lyx-tests branch as playground. I > slightly prefer the latter. What do you think? >
I tend towards the latter as well. It strikes me more easy to follow. Jürgen > > > Georg > >
