On 21/10/12 19:54, Richard Hipp wrote:
[...]
I'm not going to include that change in the upcoming 1.24 release since
I want to give more time to bake. It will appear in version 1.25.
In the meantime, you can download the code and build your own Fossil
executable that includes this
On 19/10/12 21:48, Richard Hipp wrote:
[...]
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?
Definitely. It
On Sun, Oct 21, 2012 at 02:54:06PM -0400, Richard Hipp wrote:
In the change above, there is no explicit resolve step. Fossil
automatically senses whether or not you have resolved the conflict through
editing.
I think that the change misses one of the most valuable situations - those of
binary
On Fri, Oct 19, 2012 at 4:42 PM, David Given d...@cowlark.com 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.)
4 matches
Mail list logo
