humanmade / altis-documentation

Documentation module for Altis
https://docs.altis-dxp.com/
6 stars 3 forks source link

Update v16 release notes #519

Closed jerico closed 1 year ago

hm-backport[bot] commented 1 year ago

The backport to v12-branch failed:

Commits ["029b37b766d63882ac179e062055c8640fb0c960","4cfac9267c8dbe004123445fd1b16ba9bb25e821","af8e467256fafeedfeba0e7457e4fe07cea92561","9f03caf86f8875817131461f0003c38333572897","29bc9739cb862f5b3f8eff8ea572b76fd358f37e","033674427f2b6689549bd554a63c2881d7092139","ed8b0a36f11088d5a11a78011be76da032189ea0"] could not be cherry-picked on top of v12-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v12-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 029b37b766d63882ac179e062055c8640fb0c960 4cfac9267c8dbe004123445fd1b16ba9bb25e821 af8e467256fafeedfeba0e7457e4fe07cea92561 9f03caf86f8875817131461f0003c38333572897 29bc9739cb862f5b3f8eff8ea572b76fd358f37e 033674427f2b6689549bd554a63c2881d7092139 ed8b0a36f11088d5a11a78011be76da032189ea0
# Create a new branch with these backported commits.
git checkout -b backport-519-to-v12-branch
# Push it to GitHub.
git push --set-upstream origin backport-519-to-v12-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v12-branch and the compare/head branch is backport-519-to-v12-branch.

hm-backport[bot] commented 1 year ago

The backport to v13-branch failed:

Commits ["029b37b766d63882ac179e062055c8640fb0c960","4cfac9267c8dbe004123445fd1b16ba9bb25e821","af8e467256fafeedfeba0e7457e4fe07cea92561","9f03caf86f8875817131461f0003c38333572897","29bc9739cb862f5b3f8eff8ea572b76fd358f37e","033674427f2b6689549bd554a63c2881d7092139","ed8b0a36f11088d5a11a78011be76da032189ea0"] could not be cherry-picked on top of v13-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v13-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 029b37b766d63882ac179e062055c8640fb0c960 4cfac9267c8dbe004123445fd1b16ba9bb25e821 af8e467256fafeedfeba0e7457e4fe07cea92561 9f03caf86f8875817131461f0003c38333572897 29bc9739cb862f5b3f8eff8ea572b76fd358f37e 033674427f2b6689549bd554a63c2881d7092139 ed8b0a36f11088d5a11a78011be76da032189ea0
# Create a new branch with these backported commits.
git checkout -b backport-519-to-v13-branch
# Push it to GitHub.
git push --set-upstream origin backport-519-to-v13-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v13-branch and the compare/head branch is backport-519-to-v13-branch.

hm-backport[bot] commented 1 year ago

The backport to v14-branch failed:

Commits ["029b37b766d63882ac179e062055c8640fb0c960","4cfac9267c8dbe004123445fd1b16ba9bb25e821","af8e467256fafeedfeba0e7457e4fe07cea92561","9f03caf86f8875817131461f0003c38333572897","29bc9739cb862f5b3f8eff8ea572b76fd358f37e","033674427f2b6689549bd554a63c2881d7092139","ed8b0a36f11088d5a11a78011be76da032189ea0"] could not be cherry-picked on top of v14-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v14-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 029b37b766d63882ac179e062055c8640fb0c960 4cfac9267c8dbe004123445fd1b16ba9bb25e821 af8e467256fafeedfeba0e7457e4fe07cea92561 9f03caf86f8875817131461f0003c38333572897 29bc9739cb862f5b3f8eff8ea572b76fd358f37e 033674427f2b6689549bd554a63c2881d7092139 ed8b0a36f11088d5a11a78011be76da032189ea0
# Create a new branch with these backported commits.
git checkout -b backport-519-to-v14-branch
# Push it to GitHub.
git push --set-upstream origin backport-519-to-v14-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v14-branch and the compare/head branch is backport-519-to-v14-branch.

hm-backport[bot] commented 1 year ago

The backport to v11-branch failed:

Commits ["029b37b766d63882ac179e062055c8640fb0c960","4cfac9267c8dbe004123445fd1b16ba9bb25e821","af8e467256fafeedfeba0e7457e4fe07cea92561","9f03caf86f8875817131461f0003c38333572897","29bc9739cb862f5b3f8eff8ea572b76fd358f37e","033674427f2b6689549bd554a63c2881d7092139","ed8b0a36f11088d5a11a78011be76da032189ea0"] could not be cherry-picked on top of v11-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v11-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 029b37b766d63882ac179e062055c8640fb0c960 4cfac9267c8dbe004123445fd1b16ba9bb25e821 af8e467256fafeedfeba0e7457e4fe07cea92561 9f03caf86f8875817131461f0003c38333572897 29bc9739cb862f5b3f8eff8ea572b76fd358f37e 033674427f2b6689549bd554a63c2881d7092139 ed8b0a36f11088d5a11a78011be76da032189ea0
# Create a new branch with these backported commits.
git checkout -b backport-519-to-v11-branch
# Push it to GitHub.
git push --set-upstream origin backport-519-to-v11-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v11-branch and the compare/head branch is backport-519-to-v11-branch.

mikelittle commented 1 year ago

@jerico The back ports failed, and that's ok.

I made the same mistake last week. Stuff for v16-only which this upgrade guide is, doesn't need to back port to the older version branches. It may need merging to master if it didn't start there. But that's all.