Martin Belev
Posted on August 21, 2019
Given the following scenario:
- the main development branch is
develop
- a feature branch (
f
for short) is created fromdevelop
- a pull request is opened for the implemented feature
- the new feature should land in the new release but a release branch is created from
develop
before the feature is reviewed and merged - the PR gets reviewed and merged
After the f
branch is merged into develop we should create a PR to the new release branch.
P.S. f
branch is rebased over develop
We decided to go with a new branch from the release branch and just cherry pick the commit that we wanted. But it was because we were in a hurry and the commit was only 1. I am still wondering if there is some other easier way to do this.
What do you think will be the best and easiest way to do it?
💖 💪 🙅 🚩
Martin Belev
Posted on August 21, 2019
Join Our Newsletter. No Spam, Only the good stuff.
Sign up to receive the latest update from our blog.
Related
python Introducing InsightfulAI: Open-Source Machine Learning Templates for Everyone
November 11, 2024
webdev Have you had a chance to try the Commenter package (Modern all-in-one commenting system)?
October 28, 2024