On Fri, Oct 19, 2012 at 4:42 PM, David Given <[email protected]> wrote:
> 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. > Fossil does not keep track of conflicts nor insist that you resolve them. Just edit the file that contained the conflict to make your resolution, the do a "fossil commit" as you normally would. In other words, omit the 3rd step above. > > 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? > It tells you about the conflict when you do the "update" or "merge". That's the only warning you have. Do you think we should enhance Fossil to keep track of conflicts and issue warnings if you try commit with unresolved conflicts? > > -- > ┌─── ｄｇ＠ｃｏｗｌａｒｋ．ｃｏｍ ───── 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 > > > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > -- D. Richard Hipp [email protected]
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
