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 _______________________________________________ Gnu-arch-users mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
