Hey all, This question might be better directed to the arch mailing list, but as it involves xtla development I thought I'd ask here first. I hope you'll all forgive me ;o)
I've been keeping up to date with Matthieu's tree by star-merging in his changes from the *tla-bookmarks-missing* buffer. This is working really well, except that when I merge in a patch that contains changes from me and changes from someone else, I get a bunch of conflicts because my changes were already in my local tree. Does anyone have any special tricks for merging in upstream patches that contain some of your own changes? As a side note: the tla-bookmarks and tla-bookmarks-missing functionality is probably the coolest thing I have ever seen :o) Cheers, Mark -- Mark Triggs <[EMAIL PROTECTED]>
