Comments (9)
Pretty this is a duplicate of this one? (or at least related)
from gitversion.
@danielmarbach I'll take a look at it
from gitversion.
Here the flow which should work but doesn't
@danielmarbach Can you elaborate on what you'd expect to be produced?
FWIW, the PreReleasePartTwo
holds the number of commits that are not known by the develop
branch. Once the release branch is merged back in develop
, this number of commits is indeed zero.
from gitversion.
In my scenario and according to GF it is perfectly valid to do changes on the release branch and merge does changes back into develop. To be honest I see the need for you guys that at some point you know the release branch is merged and therefore the commit count is reseted. So I have no idea how to solve that properly. I mean I can live with cherry picking approach... What's your thought on this?
from gitversion.
I'm not sure to understand what prevents one to merge the release branch back into develop? I may be missing something obvious (sorry for that).
from gitversion.
You can only do that once. If done the commit counter on the release branch is zeroed.
from gitversion.
@danielmarbach Well, I'm pretty sure if you add a commit to that branch, the commit counter will spring back to one (ie. a new commit on that branch that develop
doesn't know about.)
release B-C-D---------F
/ \
develop -A-------E
In the graph above, release has been merged back into develop with E. Building release when pointing at F should issue a commit number of 1.
from gitversion.
Yeah but in this case you are practically regenerating previous SemVers!
From: nulltoken [mailto:[email protected]]
Sent: Samstag, 22. Februar 2014 23:14
To: Particular/GitFlowVersion
Cc: danielmarbach
Subject: Re: [GitFlowVersion] Gitflow allows merging bugfixes from release to develop. GitFlowVersion doesn't (#86)
@danielmarbach https://github.com/danielmarbach Well, I'm pretty sure if you add a commit to that branch, the commit counter will spring back to one (ie. a new commit on that branch that develop doesn't know about.)
release B-C-D---------F
/
develop -A-------E
In the graph above, release has been merged back into develop with E. Building release when pointing at F should issue a commit number of 1.
—
Reply to this email directly or view it on GitHub #86 (comment) . https://github.com/notifications/beacon/174258__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcwODY0MDAzOSwiZGF0YSI6eyJpZCI6MjYwOTQ4Njh9fQ==--a78e11530f2df7088903257004cb6b5dd8d4fd27.gif
from gitversion.
Pretty sure this is now fixed
from gitversion.
Related Issues (20)
- [Improvement]: Create TaggedSemanticVersionService class HOT 1
- [ISSUE]: gitversion/execute@1 task uses branch from wrong repository HOT 1
- [Improvement]: Finalizing the configuration of GitFlow and GitHubFlow workflow and align with the Mainline version strategy HOT 1
- [ISSUE]: n unexpected error occurred: LibGit2Sharp.LibGit2SharpException: No error message has been provided by the native library HOT 3
- [BUG]: GitVersion (in Azure Devops) calculating wrong version when building a tag HOT 9
- Verifies the contents of `configuration.md` against the default serialized configuration
- [ISSUE]: Regex Capture Groups don't work correctly on release branch. HOT 3
- gitversion from container image default behaviour differs from other installation methods HOT 5
- [Documentation]: Documenting the GitFlow workflow and create sequence diagrams HOT 1
- [ISSUE]: Gitversion failing in teamcity run configuration HOT 1
- [ISSUE]: Can't make GitVersion work in conjunction with WiX Toolset 4.0/5.0 HOT 3
- Forced push breaks GitVersion
- [ISSUE]: GitVersion AzDo task appears to be stuck at version 5.0.1 HOT 1
- [ISSUE]: Plan Migration to .NET 7.0+ SDK HOT 1
- [ISSUE]: NotImplementedException in TrunkBased-Workflow HOT 1
- [Feature]: Support of multi mainline branches in the Mainline version strategy
- [ISSUE]: Unable to get Main branch to update WeightedPreReleaseNumber HOT 1
- [ISSUE]: `init` command still shown in the help output HOT 2
- [Documentation]: Documenting the GitHubFlow workflow and create sequence HOT 1
- [ISSUE]: netstandard2.0 Support in 6.0.0 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 gitversion.