On Sat, 3 Feb 2018 15:08:41 +
Bjarni Ingi Gislason wrote:
> CONFLICT (submodule): Merge conflict in gnulib
You can't have a conflict unless your local version contains changes
not present in the version on origin master. If you don't care about
those changes, you can remove the file, check
> 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
> R
Output form "git pull origin master":
>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.
