Stephen Leake <[EMAIL PROTECTED]> writes: >> Could you please merge from my tree and resolve the conflicts. > > Hmm. I got those conflicts when I merged from your branch this > morning, but I thought I had resolved them. I guess I missed a step > somewhere. Or maybe you caught my web site in the middle of an update? > > I've now done another pull/merge/commit/push cycle; it should be > cleared up.
The last change I see is "184: add working commit to dvc-status-add".
Maybe you forgot to run "bzr commit" after the merge?
--
Michael Olson -- FSF Associate Member #652 |
http://mwolson.org/ -- Jabber: mwolson_at_hcoop.net | /` |\ | | |
Sysadmin -- Hobbies: Lisp, GP2X, HCoop | |_] | \| |_|
Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner |
pgphA9n1JGVPy.pgp
Description: PGP signature
_______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
