'completed' section on rebase philosophy

2024-12-16 10:44:22 +01:00
parent 6345e424b0
commit 20d20577f2
1 changed files with 1 additions and 1 deletions
--- 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.