Re: [Spice-devel] [PATCH spice-gtk] Update submodules using the --merge option

2017-07-31 Thread Christophe de Dinechin
> On 31 Jul 2017, at 10:58, Frediano Ziglio wrote: > >> >> Hi >> >> - Original Message - >>> From: Christophe de Dinechin >> > >>> >>> By default, subdmodules will be checked out in detached state. >>> This means

Re: [Spice-devel] [PATCH spice-gtk] Update submodules using the --merge option

2017-07-31 Thread Christophe de Dinechin
> On 28 Jul 2017, at 12:19, Marc-André Lureau > wrote: > > Hi > > - Original Message - >> From: Christophe de Dinechin > > >> >> By default, subdmodules will be checked out in detached state. >> This

Re: [Spice-devel] [PATCH spice-gtk] Update submodules using the --merge option

2017-07-31 Thread Frediano Ziglio
> > Hi > > - Original Message - > > From: Christophe de Dinechin > > > > By default, subdmodules will be checked out in detached state. > > This means that you may lose some work in progress. > > Lose is a bit strong here. > > If you have uncommitted changes,

Re: [Spice-devel] [PATCH spice-gtk] Update submodules using the --merge option

2017-07-28 Thread Marc-André Lureau
Hi - Original Message - > From: Christophe de Dinechin > > By default, subdmodules will be checked out in detached state. > This means that you may lose some work in progress. Lose is a bit strong here. If you have uncommitted changes, submodule update will fail.

[Spice-devel] [PATCH spice-gtk] Update submodules using the --merge option

2017-07-28 Thread Christophe de Dinechin
From: Christophe de Dinechin By default, subdmodules will be checked out in detached state. This means that you may lose some work in progress. Using the --merge option will also ensure that if there are conflicts between your current submodule and the version referenced by