uvicgse / project-virtual-team-2

4 stars 3 forks source link

Fix Master by rebasing and remerging all PRs after node/electron upgrade #131

Open mdesco18 opened 5 years ago

mdesco18 commented 5 years ago

Instructions:

0) Reset master: git checkout master -> git pull -> git status

1) Rebase and PR

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