Hi, Quoting Michael Olson <[EMAIL PROTECTED]>:
> One thing to look out for before merging is conflict indicators in the > source. The looks like this: > > <<<<<<< BASE > Stuff from the current repo. > ======= > Stuff from the repo you're merging from. >>>>>>>> MERGE-SOURCE > > Be sure to clean those up before committing. I found one of those and > cleaned it up already. > As I'm used to working with subversion, I probably did not get the right clues from arch that there were conflicts. I'll make sure to scan the sources next time. regards, Markus -- Markus Hoenicka [EMAIL PROTECTED] (Spam-protected email: replace the quadrupeds with "mhoenicka") http://www.mhoenicka.de _______________________________________________ Muse-el-discuss mailing list [email protected] https://mail.gna.org/listinfo/muse-el-discuss
