[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [groff] Merge conflict for "gnulib"

From: Werner LEMBERG
Subject: Re: [groff] Merge conflict for "gnulib"
Date: Sat, 03 Feb 2018 16:20:09 +0100 (CET)

> From git://
>  * 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?


  rm -rf gnulib
  git reset --hard
  git pull


reply via email to

[Prev in Thread] Current Thread [Next in Thread]