- the main development branch is
- a feature branch (
ffor short) is created from
- 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
developbefore the feature is reviewed and merged
- the PR gets reviewed and merged
f branch is merged into develop we should create a PR to the new release branch.
f branch is rebased over
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?
Most people want to make things perfect. Sometimes we evaluate the complexity of an upcoming goal or a problem. So, the fear to not complete it perfectly or "wrong" (Yeah, who are judges? 🤔) stops us even from trying.