From 89c3679be442cc17b9a050ae024dce572baf5a60 Mon Sep 17 00:00:00 2001
From: philippe lhardy <pl@artisanlogiciel.net>
Date: Wed, 30 Jul 2025 08:50:28 +0200
Subject: [PATCH] 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 | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 nextcloud_devenv/git_status.awk

diff --git a/nextcloud_devenv/git_status.awk b/nextcloud_devenv/git_status.awk
new file mode 100644
index 0000000..fe5ef29
--- /dev/null
+++ b/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   }
+