[x] If releasing module changes, the Pull Request title is prepended with "[\<Azure Stack Hub Release Version>]". E.g., a title may be "[2301] Compute RP changes". Otherwise, this is not necessary.
[x] Updated origin dev branch locally. (git fetch origin dev)
[x] The Pull Request has a single commit. The following is a standard way to achieve a single commit:
git checkout feature
git rebase origin/dev -i
In the VIM editor press ESC and i to enter edit mode.
Select commits to fixup or squash commits (instructions are in the editor).
Press ESC, type :wq, and press Enter to save and quit.
[x] Resolved any rebase conflicts (basically merge conflicts).
[x] Commits are rebased on top of latest remote dev branch.
[x] The changes are tested. Make sure to test after the rebase step.
[x] Updated remote feature branch. (Force push if you've rebased onto new changes from dev: git push origin feature -f)
Description
Merging updates from multiple RPs for ASH 2301.
Checklist
Please verify the following checklist in order:
dev
branch locally. (git fetch origin dev
)git checkout feature
git rebase origin/dev -i
ESC
andi
to enter edit mode.ESC
, type:wq
, and pressEnter
to save and quit.dev
branch.git push origin feature -f
)Description Merging updates from multiple RPs for ASH 2301.