From 20d20577f2d369357f5becea62fd91a055778603 Mon Sep 17 00:00:00 2001
From: scbj <scbj@zhaw.ch>
Date: Mon, 16 Dec 2024 10:44:22 +0100
Subject: [PATCH] 'completed' section on rebase philosophy

---
 git.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git.md b/git.md
index 6b6053e..7a4ccd1 100644
--- a/git.md
+++ b/git.md
@@ -91,5 +91,5 @@ git rebase <target-branch>
 # proceeds after solving rebase conflict
 git rebase --continue
 ```
-
+This is only necessary, if the 'main' branch progressed in the mean time, otherwise one just merges the feature branch into the 'main' branch.