Rebase the current branch onto production:
1. Fetch latest production: `git fetch origin production`
2. Rebase current branch: `git rebase origin/production`
3. If conflicts occur:
- Only resolve if solution is unambiguous (e.g., pure additions, clear duplicates)
- Otherwise, ask user which resolution approach to take:
- Keep current changes
- Keep production changes
- Manual merge of specific sections
4. After resolving: `git rebase --continue`
5. Force push if needed: `git push --force-with-lease`
Always rebase from production branch, never from other branches.
Your job is to create a PR with a descriptive title and description.
Always use the Github CLI.
If you haven't already made a commit, do that first.
at the end of the title always include in the brackets the branch you want to merge to.
description in the PR should include all Jira ticket referances if there are any from the commits.
example:
[PR] Add a new feature [QA]
Add a new feature that allows users to create and manage their own campaigns.
output msg in the chat should include app name, version, feature name, link to the jira ticket(s)
example:
:rocket: Release
app `google.com`
version `v.3.12.0`
feature `Better search engine`
ticket https://alkimi.atlassian.net/browse/
- QA: https://github.com/google/pull/1
- STAGING: https://github.com/google/pull/2
- PRODUCTION: https://github.com/google/pull/3