zegonix/collection
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'completed' section on rebase philosophy

Browse Source
This commit is contained in:
scbj
2024-12-16 10:44:22 +01:00
parent 6345e424b0
commit 20d20577f2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git.md
View File

@@ -91,5 +91,5 @@ git rebase <target-branch>
# proceeds after solving rebase conflict # proceeds after solving rebase conflict
git rebase --continue 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.