Skip to content

Instantly share code, notes, and snippets.

@vanduc1102

vanduc1102/git_rebase.bash

Created September 12, 2020 15:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save vanduc1102/90e9893dd0d7e7b32f4c3216dad4e2bb to your computer and use it in GitHub Desktop.
Save vanduc1102/90e9893dd0d7e7b32f4c3216dad4e2bb to your computer and use it in GitHub Desktop.
Download ZIP
Git rebase, assumed that you are working on branchA
Raw
git_rebase.bash
BranchA : // Commit verything
BranchA : git fetch origin master:master
BranchA : git rebase master
// If no conflicts, you are lucky
// possible there are some conflicts ==> RESOLVE theme
BranchA : git add all_conflicts_files
BranchA: git rebase --continue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment