question-mark
Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

please merge+tag newest branches first

See original GitHub issue

Is your feature request related to a problem? Please describe. Sometimes fixes are merged and tagged on older branches before merging and tagging on newer branches.

For example in https://github.com/ceph/ceph-ansible/pull/3352 , the backport to stable-3.1 was merged and tagged as v3.1.11, but the backport to stable-3.2 was not merged. If users upgraded from v3.1.11 to v3.2.0, they would experience a regression.

Describe the solution you’d like Would you please merge and tag fixes on the latest branches (eg. stable-3.2) before merging and tagging on older branches (eg. stable-3.1) ?

Is there any way to have Mergify enforce this? Is that an RFE to Mergify?

Issue Analytics

  • State:closed
  • Created 5 years ago
  • Comments:7 (7 by maintainers)

github_iconTop GitHub Comments

1reaction
ktdreyercommented, Dec 3, 2018

Thanks for explaining @leseb . If there is anyone who is pressuring you to provide fixes on older branches who cannot wait for it to land in newer branches, I would ask that you please have that person bring their concerns directly to me. I would be happy to have a conversation with anyone in Red Hat or elsewhere who is pressuring us to ship fixes in older branches first.

Fixing in the newest version first is something that we must do for all projects (ceph, nfs-ganesha, the kernel, etc).

Given the number of changes that we’re tracking in ceph-ansible, and the number of stable branches we’re tracking, the risk of regressions for QE and our users is high. When the bugs are high-pressure like the ones mentioned above, it means that we’ll incur an even greater cost if we also introduce a regression in that code path or feature.

0reactions
ktdreyercommented, Dec 4, 2018

Cool, thanks.

Read more comments on GitHub >

github_iconTop Results From Across the Web

Ability to merge a tag into a given branch (#18466) - GitLab
I have a four main branches: develop; master; staging; production. When I merge develop into master, a tag is created with correct version ......
Read more >
git - How to merge tags to a branch while ... - Stack Overflow
When I am trying to merge branch-A into branch-B the changes are merged but not tags. When I am running git tag --merged...
Read more >
Git and Gitlab: Branch, Merge, and Tag - YouTube
A video demonstrating how to branch, merge, resolve merge conflicts, and tag using the command line, Git, and Gitlab.
Read more >
Git: Merge Branch into Master - Stack Abuse
First we run git checkout master to change the active branch back to the master branch. Then we run the command git merge...
Read more >
git-branch Documentation - Git
With --merged , only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will...
Read more >

github_iconTop Related Medium Post

No results found

github_iconTop Related StackOverflow Question

No results found

github_iconTroubleshoot Live Code

Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free

github_iconTop Related Reddit Thread

No results found

github_iconTop Related Hackernoon Post

No results found

github_iconTop Related Tweet

No results found

github_iconTop Related Dev.to Post

No results found

github_iconTop Related Hashnode Post

No results found