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

[Christophe de Dinechin]

From: Christophe de Dinechin <dinechin at redhat.com>

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 the parent, you get an opportunity
to resolve the conflicts instead of having your changes
silently wiped out.

Signed-off-by: Christophe de Dinechin <dinechin at redhat.com>
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index cc7bda3..3fbd5b3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 
 (
     cd "$srcdir"
-    git submodule update --init --recursive
+    git submodule update --init --recursive --merge
     gtkdocize
     autoreconf -v --force --install
 )
-- 
2.11.0 (Apple Git-81)