add rebase instructions to the merge way of catching up main

Author: chendaniely

book/lectures/050-version-control-2.qmd

@@ -337,6 +337,10 @@ What do you think are pros & cons of each of these branching workflows?
 
 ### What happens when my feature branch falls behind main?
 
+There are a few ways you can fix this problem.
+
+#### Using merge
+
 > How to catch up a branch that has fallen behind the `main` branch using the command line:
 >
 > - run `git pull origin main` to pull any changes from the remote version of main that we might not have
@@ -345,6 +349,14 @@ What do you think are pros & cons of each of these branching workflows?
 > - run `git push origin <branch>` to push our updated branch to the remote
 
 
+#### Using rebase
+
+1. Make sure everything is committed in your new branch
+2. Move to the main branch: `git switch main`
+2. Make sure the main branch is up to date: `git pull origin main`
+3. Move back over to your branch: `git switch <branch>`
+4. Update the changes from main: `git rebase main`
+
 ## Next:
 
 - file and directory structure for data analysis projects