[Top][All Lists]

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

Re: [groff] Merge conflict for "gnulib"

From: James K. Lowden
Subject: Re: [groff] Merge conflict for "gnulib"
Date: Sat, 3 Feb 2018 12:29:14 -0500

On Sat, 3 Feb 2018 15:08:41 +0000
Bjarni Ingi Gislason <address@hidden> 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.  


reply via email to

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