Skip to main content
13 votes
Accepted

How to modify workflow to allow multiple features per release?

Answering your questions below: Would the above proposed workflow be considered a standard workflow? There isn't a strict "standard" workflow that everyone adheres to, but your workflow is ...
Jimmy Kurian's user avatar
11 votes

Compare version numbers

In general, the dots are necessary, otherwise you couldn't distinguish 0.2.12 from 0.21.2 (and countless other examples). If you can ensure that the major, minor and patchlevel revision are always ...
Kilian Foth's user avatar
6 votes

How to modify workflow to allow multiple features per release?

There's no such thing as a "standard workflow". There are some models that are commonly used - look at gitflow, GitHub flow, GitLab flow, oneflow, three-flow, and trunk-based development for ...
Thomas Owens's user avatar
  • 83.2k
5 votes

How to automate version bumping, when version bumping involves changes in source code and a git tag?

Am I trying to implement a bad strategy here? If the strategy works for you, then it is not a bad strategy. On the other hand, changing the same line of __init__.py in every feature branch is a ...
Bart van Ingen Schenau's user avatar
5 votes
Accepted

Is a 'base' file always necessary when doing a merge?

Without a base file (a common ancestor of the files you want to merge) an automated algorithm can only tell that there is a difference between A and B, but it cannot tell if that is because A added ...
Bart van Ingen Schenau's user avatar
5 votes

How to modify workflow to allow multiple features per release?

No, mainly because of : "4. Version bump in source code..." It's been said a million times; Version published apps, not source code. If you want to get the version into the source, then you ...
Ewan's user avatar
  • 77k
4 votes
Accepted

Git Flow best practice for quarantine snapshot to staging environments (dev, test, prod)?

I think gitflow would want you to create a release branch from dev and deploy that to your test server. Bug fixes go on this branch and its eventually merged into master and deployed to live. You can ...
Ewan's user avatar
  • 77k
4 votes

Identify downsides: versioning auto-generated Terraform source code

I wouldn't save the generated templates to source control. But I would save them. Source control is not a document management system or a general storage system. Your generated templates should be ...
Ewan's user avatar
  • 77k
3 votes

Compare version numbers

I strongly recommend you extract the three digit sequences separately, ignore any knowledge how many digits they should have, and convert them into integers each. Then compare the highest integer, ...
gnasher729's user avatar
  • 45.8k
3 votes

When should release versions be bumped?

When I think about this the first thing that comes to mind when I think about your question, is that the version should be bumped according to specific rules. and this is pretty much the way I do it ...
Greg Bowne's user avatar
2 votes

When should release versions be bumped?

The way I see it you are doing a few things "wrong" Confusing versions of code and versions of your product Versioning code is problematic, I can have concurrent branches, rollbacks, ...
Ewan's user avatar
  • 77k
2 votes

Is a 'base' file always necessary when doing a merge?

Except in special cases (for example you know that lines were only added - not deleted or changed) you need three versions of a file to do an automated merge. However it is not necessary for one of ...
DavidT's user avatar
  • 3,348
1 vote

How to go about version numbers in a C# solution

Brief Answers: Does this workflow make sense on these kind of solutions? CI pipeline keeps track of version, auto bumps every build and manually can be incremented for major/minor ? Yes Any ...
Ewan's user avatar
  • 77k
1 vote

Compare version numbers

I agree 100% with Kilian Foth's answer, that doing what you are trying is likely to become error prone. However, if you want to combine the version into a digit-only string for some technical reason, ...
Doc Brown's user avatar
  • 209k
1 vote

Compare version numbers

Your current way of comparing is the most robust way of doing a version compare, because it can also handle slightly malformed versions, like a minor version of 10 or a leading 0 missing somewhere. If ...
Bart van Ingen Schenau's user avatar
1 vote

How to automate version bumping, when version bumping involves changes in source code and a git tag?

Answering my own question here at a later date. Am I trying to implement a bad strategy here? Yes, I think this is a bad strategy. Specifically, using a package-global __version__ attribute to ...
Jagerber48's user avatar

Only top scored, non community-wiki answers of a minimum length are eligible