1) if your branch is ahead of origin/master: git reset --hard <commit-sha of latest commit on github> or git branch -D master
2) if your branch has merge commits from a later version of master then git reset it as well to the commit when you put up your original PR
1) Rebase and PR
1) git checkout <your-branch> -> git rebase -i origin/master rebase the branch of your PR with master and test it still works. Do this from command line or IDE
2) make a new PR for this updated branch
3) wait for approval (person who owns next PR in queue should be doing the review)
4) rebase and merge with master
5) next PR in queue goes back to step 1)
PRs that require re-merging:
Review
merged
105: Stash drop/#122: stash branch @mdesco18
117: amend last commit @Zanelib1
115: drag n drop @aujlarj
94: Fix issue 20 @Leon0315
119: Fix 118 show/search branch/tags @jamshale
97: Fix issue 89/101 @cchampernowne
126: add tag hover support @csamcharles
128: fix issue 127 @mdesco18
101 create upstream branch
123: stash show / #124: fix issue 2 @mdesco18
pending
116: move fetch btn @ajlarivi
130: git move @rhyslawsn
REVIEWERS Make sure that you do not have a local copy of a branch you are testing before checking it out
Instructions:
0) Reset master:
git checkout master
->git pull
->git status
git reset --hard <commit-sha of latest commit on github>
orgit branch -D master
git reset
it as well to the commit when you put up your original PR1) Rebase and PR
git checkout <your-branch>
->git rebase -i origin/master
rebase the branch of your PR with master and test it still works. Do this from command line or IDEPRs that require re-merging:
Review
merged
105: Stash drop/#122: stash branch @mdesco18
117: amend last commit @Zanelib1
115: drag n drop @aujlarj
94: Fix issue 20 @Leon0315
119: Fix 118 show/search branch/tags @jamshale
97: Fix issue 89/101 @cchampernowne
126: add tag hover support @csamcharles
128: fix issue 127 @mdesco18
101 create upstream branch
123: stash show / #124: fix issue 2 @mdesco18
pending
116: move fetch btn @ajlarivi
130: git move @rhyslawsn
REVIEWERS Make sure that you do not have a local copy of a branch you are testing before checking it out