Whoops, I sync'ed with a laptop that had the quite old translations I did some months ago... and now "mtn merge" say this:
monotone: [source] 597dfcb31c5f9f1835157f5bcf03273625bf235b monotone: [source] c7db63267eaaa6718afacb1227f93323b53a4802 monotone: warning: rename target conflict: nodes 1500, 1435, both want parent 390, name it.po monotone: warning: resolve non-content conflicts and then try again. monotone: error: merge failed due to unresolved conflicts For now, I'm simply using -r in update to keep on the "modern" head, but eventually I will sync wrongly and push those old heads on venge.net, I fear. What is the "real" solution to merge it? (and: what does it means both want to use name it.po? what's so strange about that that a simple call to kdiff3 can't resolve like usual?) Lapo _______________________________________________ Monotone-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/monotone-devel
