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

Include first commit to range, render commits to body #217

Merged
merged 1 commit into from
Jul 30, 2024

Conversation

makelicious
Copy link
Collaborator

@makelicious makelicious commented Jul 19, 2024

Same changes: opencrvs/opencrvs-core#7397
Issue:

  1. When the PR bot was successful, the first commit got removed due cherry-pick behaviour. In git cherry-pick h4shba..h4ashb left side is exclusive. It differs from what git log shows with corresponding range syntax.
  2. The commands provided by PR had the same behaviour. From a quick look there has not been many manual "Merge changes from PR" fixes that utilise the provided syntax. People tend to fix it by other means.
  3. When referring to commit range, it can exists in multiple branches. Picking from develop
    yields different result than the feature branch.

Changes:

  1. Include first commit to cherry-pick range
  2. Print out commits to PR body when automatic cherry-pick fails.

Sample PR: opencrvs/opencrvs-core#7395

Further steps if needed:

  • Consider whether we can cherry-pick based on branch rather than range ( e.g. git cherry-pick origin/release-v1.6.0..origin/chore/ocrvs-7133-eslint-warnings)
    • develop might include more merge commits, and commits related to different releases than the target release within the range. Ranges with merge commits will fail automatic cherry-pick without --mainline
    • I assume git cherry-pick´ implicitly defaults to main branch (develop`) when picking a range if there are multiple options.
  • Consider adopting consistent rules for branching for easier cherry-picking.
    • Prevent updating branch Merge branch 'develop' into chore/ocrvs-7133-eslint-warnings / adopt rebasing to develop.

@makelicious makelicious merged commit f63dbfc into develop Jul 30, 2024
1 of 2 checks passed
@makelicious makelicious added this to the v1.6.0 milestone Jul 30, 2024
github-actions bot pushed a commit that referenced this pull request Jul 30, 2024
github-actions bot pushed a commit that referenced this pull request Jul 30, 2024
makelicious added a commit that referenced this pull request Jul 30, 2024
🍒 Merge changes from PR #217 to release-v1.6.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants