gitflow VS GitVersion

1. GitFlow

Pull Requests (or Merge Requests) are merged only when (1) all of the automated tests pass; and (2) enough necessary reviewers have indicated approval.

Git doesn't tell you when it's necessary to have full test coverage and manual infosec review in development cycles that produce releases, and neither do Pull Requests.

https://westurner.github.io/hnlog/#comment-19552164 ctrl-f hubflow

It looks like datasift's gitflow/hubflow docs are 404'ing, but the original nvie blog post [1] has the Git branching workflow diagrams; which the wpsharks/hubflow fork [3] of datasift/gitflow fork [2] of gitflow [1]has a copy of in the README:

[1] https://github.com/nvie/gitflow

[2] https://github.com/datasift/gitflow

[3] https://github.com/wpsharks/hubflow?tab=readme-ov-file

https://learngitbranching.js.org/ is still a great resource, and it could work on mobile devices.

The math of VCS deltas and mutable and immutable content-addressed DAG nodes identified by 2^n bits describing repo/$((2*inf)) bits ;

>> "ugit – Learn Git Internals by Building Git in Python" https://www.leshenko.net/p/ugit/

SLSA.dev is a social construct atop e.g. git, which is really a low-level purpose-built tool and Perl and now Python porcelain.

jj (jujutsu) is a git-compatible VCS CLI: https://github.com/martinvonz/jj

"Ask HN: Best Git workflow for small teams" (2016)

A successful Git branching model - известная модель ветвления от Vincent Driessen.

Before embarking on the project, we needed to decide on our Git workflow. Having experienced the unnecessary indirection and bureaucracy of Gitflow, I immediately proposed and implemented a trunk-based strategy instead.

As a best practice, consider creating a dev branch where you can stage your code and collaborate with other developers on your team. Alternatively, you can follow the Trunk-based development branching strategy. For larger teams and complex deployment cycles, the Gitflow branching model might be more suitable.

Note - this IS NOT Git Flow, which is way too complicated for what we're doing. Even the person who created Git Flow has some warnings and thoughts about it, 10 years later (https://nvie.com/posts/a-successful-git-branching-model/).

just use Gitflow

Git and this: https://nvie.com/posts/a-successful-git-branching-model/

Gitversion: It reads your commit history and generates a semver version out of it. Say you are compiling main branch and have a tag 1.0. Then, you squash 3 PRs. When you build this version, the new version number will be 1.0.3. You can configure it to be smarter about increasing major, minor, patch fields. I typically use prefix on the commit messages so that it generates versions correctly. See more at https://gitversion.net/docs/

GitVersion is not available by default and needs to be installed beforehand if we want to use the features it offers. The action is available here.

Check this out https://gitversion.net/docs/

At work we use https://gitversion.net/docs/ in our devops pipelines. Similaf to git-semver it generates a version based on what's published previously.

Under Linux I use gitflow and gitversion. The former helps me with branch and tags management, the latter keep tracks of the semantic version in a semi-automatic fashion (given a branch/commit/tag it generate a semver automatically based on the repo log). Gitflow should be supported by GUI tools too, but I'm more a CLI guy.

I’m not sure about in Bitbucket, but our pipeline has installed GitVersion which ups the build version based on SemVer. https://gitversion.net/docs/ We have a HealthCheck endpoint to return this version.

I know that GitVersion exists, which I think can automatically calculate the version number for me. But it's not entirely clear to me that it will do this. Also it doesn't seem to have a nbgv set-version equivalent that will just create a tag based on the calculated version number.

Kind of like you mention though, I tend to still create a build script using gitversion then just have the GitHub Action kick off the script. I find value in being able to create artifacts on a developer machine so having a simple script to run makes that as painless as possible and when I last looked a year or so ago there wasn't a good way of running GitHub Actions on your development machine.

Self promotion: I made Verlite for this purpose, tho something like GitVersion might be more suitable for your workflow.