tools to easy merge

git status > status.txt
awk -f git_statut.awk status.txt >mergeit.sh

then use mergeit.sh on git repository ( with prior check ;-) ).

nextcloud_devenv/git_status.awk

@@ -0,0 +1,9 @@
+#! /bin/awk -f
+
+function dirname(filename)
+{
+    return ("$(dirname " filename ")")
+}
+
+/modifié :/{ print "mkdir -p changed/" dirname($2) "; mv " $2 " changed/" $2 "; git checkout " $2 "; meld " $2 " changed/" $2   }
+