diff --git a/git.md b/git.md index 6b6053e..7a4ccd1 100644 --- a/git.md +++ b/git.md @@ -91,5 +91,5 @@ git rebase # 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.