Commit e0382f1
committed
>>> PRE-MERGE INSTRUCTIONS <<<
1. STOP. Both of the following must be done before proceeding, in this order:
a. omnibus-software-private rebuild branch must have merged to main
b. chef-server-omnibus-config rebuild branch must have merged to main
Do not proceed until BOTH are confirmed.
2. Remove this commit:
git reset --hard HEAD^
(This leaves commit A — ".gitmodules points to main" — as the tip.)
3. Advance the omnibus submodule SHA to the new omnibus-config main HEAD:
cd omnibus
git fetch origin
git checkout main
git pull origin main
cd ..
git add omnibus
git commit -sm "Advance omnibus submodule to post-merge omnibus-config main HEAD"
4. git push origin <chef-server-pr-merge-branch>
Then open/merge the PR on github.com/chef/chef-server.
Signed-off-by: Lincoln Baker <51833247+lbakerchef@users.noreply.github.com>1 parent df3d936 commit e0382f1
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
0 commit comments