Skip to content

Rebase Workflow with PRs Protected Pushes To Master

Jump to bottom Edit New page
Yomi edited this page Jul 17, 2019 · 3 revisions
  1. git checkout master
  2. git fetch
  3. git merge origin/master --ff-only
    • Resolve any conflicts.
  4. git checkout -b feature-branch origin/feature-branch
  5. git rebase master
    • Resolve any conflicts - May do this multiple times, up to once per commit you rebase.
    • Commit
  6. git push (-f may be necessary)
  7. PR
Add a custom footer
Add a custom sidebar
Clone this wiki locally