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

Release 1.8 #790

Merged
merged 1 commit into from
Aug 29, 2023
Merged

Release 1.8 #790

merged 1 commit into from
Aug 29, 2023

Conversation

fproldan
Copy link
Owner

@fproldan fproldan merged commit 98b3801 into diamoerp-develop Aug 29, 2023
1 of 8 checks passed
@fproldan fproldan deleted the release_1_8 branch August 29, 2023 17:31
@github-actions
Copy link

The backport to diamoerp-staging 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-diamoerp-staging diamoerp-staging
# Navigate to the new working tree
cd .worktrees/backport-diamoerp-staging
# Create a new branch
git switch --create backport-790-to-diamoerp-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 98b38017a6a8d867b8e2612e2a99e9172731f6ec
# Push it to GitHub
git push --set-upstream origin backport-790-to-diamoerp-staging
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-diamoerp-staging

Then, create a pull request where the base branch is diamoerp-staging and the compare/head branch is backport-790-to-diamoerp-staging.

fproldan added a commit that referenced this pull request Aug 29, 2023
fproldan added a commit that referenced this pull request Aug 29, 2023
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.

1 participant