Matthieu Moy <[EMAIL PROTECTED]> writes: > Stefan Reichör <[EMAIL PROTECTED]> writes: > >> I'd like to merge from Matthieu, but it seems that your mirror is not >> up to date: > > It is. And there's something going wrong: if I merge from you now, it > removes my changes from the last few revisions. No time to investigate > more right now.
One possible scenario is that Daniel merged from you and undid your changes. So the merge from Matthieu is recorded, but all changes are reverted. The solution I see is, that Matthieu merges from my tree and reapplies his changes. After that everything should work again. Stefan. _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
