'completed' section on rebase philosophy
This commit is contained in:
1 parent
6345e424b0
commit
20d20577f2
1 file changed
+1
-1
@@ -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.
|
||||||
|
|
||||||
Reference in new issue
Block a user