Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-introduce changelog #956

Merged
merged 3 commits into from
Feb 2, 2021
Merged

Re-introduce changelog #956

merged 3 commits into from
Feb 2, 2021

Conversation

oscerd
Copy link
Contributor

@oscerd oscerd commented Feb 2, 2021

No description provided.

@oscerd oscerd merged commit 08d53dd into master Feb 2, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Feb 2, 2021

The backport to camel-master failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-camel-master camel-master
# Navigate to the new working tree
cd .worktrees/backport-camel-master
# Create a new branch
git switch --create backport-956-to-camel-master
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ---mainline 1 08d53ddb6c705f134ca83157b4d9bad7e0cbaa04
# Push it to GitHub
git push --set-upstream origin backport-956-to-camel-master
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-camel-master

Then, create a pull request where the base branch is camel-master and the compare/head branch is backport-956-to-camel-master.

@oscerd oscerd deleted the changelog-is-back branch February 2, 2021 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant