> From git://git.savannah.gnu.org/groff
> * branch master -> FETCH_HEAD
> warning: Failed to merge submodule gnulib (commits don't follow merge-base)
> Auto-merging gnulib
> CONFLICT (submodule): Merge conflict in gnulib
> Auto-merging contrib/mom/om.tmac-u
> Removing VERSION
> Removing REVISION
> Auto-merging ChangeLog
> Auto-merging .gitignore
> Automatic merge failed; fix conflicts and then commit the result.
Hmm, for me, `git pull' worked just fine.
> How is the conflict to be resolved, "git diff --check" gives no
> output?
Try
rm -rf gnulib
git reset --hard
git pull
Werner
