What exactly is one supposed to do when darcs reports a conflict?
Darcs announced a conflict, then put two indicator lines in one of my
files. Now these special lines show up in whatsnew:
darcs whatsnew
{
hunk ./app/webroot/css/sonshine-styles.css 32
- line-height: 200%;
}
DREAMHOST Sun Oct 29 15:06:18 ~/sonshine>darcs whatsnew
{
hunk ./app/webroot/css/sonshine-styles.css 32
- line-height: 200%;
}
What should I do? I've tried various manipulations, but everything
keeps coming back to this same situation. I'm now pretty well
confused.
Thank you very much for any advice you might have.
Ralph
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
