On Sat, 3 Feb 2018 15:08:41 +0000 Bjarni Ingi Gislason <bjarn...@rhi.hi.is> 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 it out again from master, and pull. --jkl
