PromucFlow_constructor/.github
Anagh Hegde 84fbdde5c1
ci: use git merge for syncing changes from release (#35902)
## Description
git merge over cherry-pick with loop by comparing head. 

## Automation

/ok-to-test tags=""

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!WARNING]
> Tests have not run on the HEAD
087dfe23f63ea4e4dc472c1c048009086976f3d1 yet
> <hr>Tue, 27 Aug 2024 10:22:10 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Streamlined workflow for synchronizing releases to the `pg` branch,
enhancing efficiency.
- Directly merges the `release` branch into the `pg` branch, simplifying
the process.
- **Bug Fixes**
- Improved handling of merge conflicts with clearer notifications and
tracking.
- **Chores**
- Refined the conditions for pushing changes, ensuring operations only
occur on successful merges.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-27 15:53:29 +05:30
..
ISSUE_TEMPLATE Update --bug-report.yaml 2024-05-02 12:38:29 +05:30
workflows ci: use git merge for syncing changes from release (#35902) 2024-08-27 15:53:29 +05:30
config-test.json chore: updated label config to let us add performance on any independent issue (#20009) 2023-01-25 15:21:22 +05:30
config.json Updated Label Config 2024-08-21 23:05:55 +05:30
config.yml chore: Update the welcome bot message (#16444) 2022-09-01 16:12:07 +05:30
labeler.yml
pull_request_template.md chore: Include a closed question to PRs template (#32517) 2024-04-18 15:21:58 +05:30
release-drafter-template.yml chore: increment minor number for snapshot versions (#30487) 2024-01-22 10:02:57 +05:30
reviewers.yml fix: Added DS pod as reviewer for all PR that changes client (#23635) 2023-05-23 15:04:16 +05:30
semantic.yml