New submission from L. Amber Wilcox-O'Hearn <[EMAIL PROTECTED]>: I had a file with line x in it. In one repository, I added several lines after line x. In another repository I changed line x. When I pulled the change of line x, the added lines were considered a conflict. This may be a tricky problem, but it just wasn't what I expected.
Thank you. -Amber \ L. Amber Wilcox-O'Hearn * http://www.cs.toronto.edu/~amber/ / -\ Graduate student * Computational Linguistics Research Group /- --\ Department of Computer Science * University of Toronto /-- ---------- messages: 3332 nosy: amber, beschmi, droundy, kowey, tommy status: unread title: Unexpected conflict __________________________________ Darcs bug tracker <[EMAIL PROTECTED]> <http://bugs.darcs.net/issue674> __________________________________ _______________________________________________ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
