So I've just had my first merge conflict (in a small private project); I updated, but had a local change to a file which collided with an incoming change. (The file had also been moved, which made things more complicated.)
In other VCSes, I'm used to using the following workflow: - do update, get told about conflict - manually resolve conflict - tell VCS that the conflict has been resolved - continue How does it work in Fossil? I can't find an equivalent to 'svn resolve', so I don't know how to tell Fossil that I've dealt with the conflict. I was also rather interested to see that 'fossil status' didn't appear to show the conflicted file. The only way I could tell it was conflicted (other than the message when doing the update) was to see the extra -original, -merge and -baseline files. What am I missing here? -- ┌─── ｄｇ＠ｃｏｗｌａｒｋ．ｃｏｍ ───── http://www.cowlark.com ───── │ "Of course, on a sufficiently small planet, 40 km/hr is, in fact, │ sufficient to punt the elastic spherical cow into low orbit." --- │ Brooks Moses on r.a.sf.c
signature.asc
Description: OpenPGP digital signature
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
