[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: baz doesn't show conflicting items after update
|
From: |
Matthieu MOY |
|
Subject: |
[Gnu-arch-users] Re: baz doesn't show conflicting items after update |
|
Date: |
Mon, 1 Aug 2005 10:36:34 +0200 (CEST) |
|
User-agent: |
SquirrelMail/1.4.4 |
Ulf Ochsenfahrt said:
> ****************************************************
> 1 conflicted items in this tree. Please
> resolve each conflict with baz "resolved 'filename'"
> ****************************************************
>
> In particular, it doesn't show WHICH files have conflicts.
1) it should, clearly.
2) you can use "baz status --conflicted" to know this
3) and the last error message should have mentionned the 2).
--
Matthieu