University:
Boston University
Course:
CAS CS 501 | Computer Science Practicum
Academic year:

2023
Views:

493

Pages:

8
Author:

Lilliana Villarreal

Rebase d' c' f d f d e c b e c dev b dev a a master master 18 Rebase f d e c b a dev First checkout to the “development" branch: git checkout dev Perform rebase git rebase master Merging 2 branches git checkout master git merge dev master 19 Rebase vs. Merge d' g c' f f d e d e c b dev c b a a master master dev 20 Rebase vs. Merge Do not rebase commits that exist outside your repository and people may have based work on them! The way to get the best of both worlds is to rebase local changes you’ve made but haven’t shared yet before you push them in order to clean up your story, but never rebase anything you’ve pushed somewhere. 21 Pushing Branches to Remote To push a branch to a remote repository git push origin dev List all remote repositories git branch –l -r (In repo2 ) Get a particular branch from remote git fetch origin dev Get all branches from remote git fetch origin git branch –l -r 22 Git tools: Stashing When you need to switch between the branches, but are not ready to push the changes you can use stashing area: # push changes to the stashing area git stash # list stashes git stash list Now you can switch branches and do other work. 23 Git tools: Stashing Once you are back to your master branch and are ready to continue your work you can pull stashed files back: # pull stashed file into your working area git stash apply 24 The End