On Saturday 05 November 2005 02:02, Max Battcher wrote: > Richard A. Smith wrote: > > I have a push only repo that we use for our master copy of things. > > Each developer pushes and pulls to/from this repo with no local > > modifications. > > > > There was a conflict with a push and so I just went to the master > > repo and did a pull and then resolved the conflict. But now I'm not > > sure how to proceed. I seem to remember reading that you really don't > > want to make any local changes to a push only repo but how would I > > resolve conflicts otherwise. > > Here your workflow would emulate that of a CVS/SVN user: after the > "conflicts found" push you would pull the full repo (most likely just > resyncing your local working copy), ``darcs resolve`` to discover the > conflicts, come up with the best fix and then ``darcs record`` it as a > separate patch which you can then push to your pull-only repo. With > the resolve patch in place your repo will be in a conflict-free state > again.
I tried this, but this fails if the local changes are what I want. I did a revert after the resolve and got a tree that looks exactly like I want it to. But there is nothing to record after that and I perpetually have a conflicting situation in my push branch.. I solved it by ssh-ing to the machine with the push branch and pulling from there (including a similar revert), not sure if that is going to get me into trouble. -- Thomas Zander
pgpXtboAb0ImJ.pgp
Description: PGP signature
_______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
