Comments (2)
Hi @emilianb, are you using the most common GitFlow way to propagate a release? Let me try to explain myself, all documents and images of GitFlow tells us to merge release branches to develop and to master (develop <- release -> master) but, if you do that way, develop will have a commit id (because of the merge) that won't exist on master and vice-versa. In a recent project, we decided to go a little bit different. We defined that we will merge from release to master, tag the version on master, and, then, merge from master to develop (release -> master -> tag new version -> develop). In that way, we guarantee that develop will always be, at least, one commit ahead of master, while still propagate the release changes for both branches. In fact, I do prefer this way. And, we used the same logic for hotfix branches (hotfix -> master -> tag new version -> develop).
from vststasks.
@ycamargo explained the problem and solution brilliantly. You need to merge release to master then master to develop.
from vststasks.
Related Issues (16)
- Stale branch issues dont show the branch name and days stale HOT 1
- Not add able to build pipeline
- Not able to see the newly created branch
- Output errors is no longer than 120 chars
- "Cannot validate argument on parameter 'Repository'. The argument is null or empty. Provide an argument that is not null or empty, and then try the command again."
- How does it work ?? HOT 1
- Add support for all branch policy attributes
- Target active Pull Requests only
- REQ: Ignore a Branch for Naming Conventions. HOT 3
- Could not find remote branch: refs/heads/master HOT 9
- Support for TLS 1.1/1.2 or update powershell hsot
- Add support for support branches HOT 1
- Error executing task HOT 2
- Unable to Authenticate when using YAML Build HOT 5
- Could not find remote branch: refs/heads/master in YAML pipeline HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from vststasks.