rebase your feature branch

backend-development · Mar 18, 2024 · 4dc2b3a · 4dc2b3a
1 parent 1ff8eb5
commit 4dc2b3a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/assets/images/git_branch.svg b/assets/images/git_branch.svg
diff --git a/assets/images/git_merge.svg b/assets/images/git_merge.svg
diff --git a/source/documents.yaml b/source/documents.yaml
@@ -68,6 +68,9 @@
     - name: Internationalization (I18n)
       url: internationalization.html
       description: How to prepare you app for many languages, many countries
+    - name: Git Rebasing
+      url: git_rebasing.html
+      description: How to work with feature branches and rebasing in git
 - name: Nodes.js
   documents:
     - name: Node vs. Rails

diff --git a/source/git_rebasing.md b/source/git_rebasing.md
@@ -27,7 +27,7 @@ a few commits W, X, Y, and Z to it, it might look like this:
 
 If you merge back into main now everything will be fine.
 
-But what if the main moves on?
+But what if the main branch moves on?
 
 
 ### Merging two branches
@@ -61,6 +61,20 @@ After the rebase a merge into main will be simple.
 
 ### Rebase your feature branch
 
+When working with feature branches you try to merge as fast as possible.
+But if the main branch moves on while you are working on your feature,
+you can use `git rebase` to catch up:
+
+
+```shell
+git fetch
+git checkout a3
+git pull origin a3
+git rebase main
+# fix problems, run test, fix problems again
+git push -f origin a3  # overwrite branch with rebased branch
+# work on your merge request
+```
 
 
 ### Resources