I am building tar files in my fossil checkout and the existence of these
non-fossil objects prevents
me from committing changes. Why does fossil care about the existance of
files that are not in the
repository before making a commit? Apparently my commit failed but fossil
reports it as a CONFLICT
I have 2 users each with their own local repositories and local checkouts. I
have a server
that keeps the two user repositories in sync. I have done "fossil update"
on both user
repositories and have verified that the repo knows about a new file that one
of the user
has introduced. The server rep
x"
user 2 -> fossil update
CONFLICT x
Re: [fossil-users] Conflict resolution
Alec Clews
Wed, 07 Oct 2009 19:25:19 -0700
You need to sync the server back to the user 2 first, then resolve the
conflict locally and push back to server.
(I'm guessing this is your 1st time around th
I'm at my wits end. I am trying out fossil and I have created two users and
one
server. I have made changes to the same file in both user repositories. I
have updated the server respository with the change from one user and now
when I do an update for the second user I get a CONFLICT message for th
4 matches
Mail list logo
