Skip to content

Document the release lines and the divergent version value #2126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tyrie Vella (tyrielv) merged 2 commits into from
Oct 7, 2026
Merged

Document the release lines and the divergent version value #2126

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
349d264
Document the release lines and the divergent version value
tyrielv Sep 30, 2026
cef5a49
Update .azure-pipelines/release.yml
tyrielv Oct 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .azure-pipelines/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ parameters:
arch: arm64

variables:
# This value is intentionally divergent between vnext and master.
Comment thread
tyrielv marked this conversation as resolved.
Outdated
# On a merge conflict here, do not take the other branch's value -
# confirm which line this branch ships.
- name: 'GVFSMajorAndMinorVersion'
value: '2.1'
- name: 'GVFSRevision'
Expand Down
26 changes: 26 additions & 0 deletions AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,32 @@ release only carries the installer and symbols**: `SetupGVFS.<version>.exe`
the compiled `MinimumGitVersion` constant in `Version.props`, which is
changed separately and rarely.

## Release lines and version numbers

Two branches carry active work:

- **`master`** — the shippable line. Public releases are cut from it.
- **`vnext`** — integration for the next minor release.

Each line carries its own `major.minor`, set by `GVFSMajorAndMinorVersion` in
`.azure-pipelines/release.yml`. The release pipeline appends the build number
to form the full version and the release tag, so `GVFSMajorAndMinorVersion`
of `2.0` with build number `26229.1` produces version `2.0.26229.1` and tag
`v2.0.26229.1`. Today `master` carries `2.0` and `vnext` carries `2.1`.

That variable is the only line in `release.yml` that differs between the two
branches, and the difference is deliberate. **Do not resolve a merge conflict
on it by taking the other branch's value.** Confirm which line the branch
ships first. Taking the wrong side stamps builds from one line with the other
Comment thread
tyrielv marked this conversation as resolved.
line's version, and nothing downstream catches it — `release.yml` is
`trigger: none` / `pr: none`, and no GitHub workflow parses it.

`master` is merged into `vnext` regularly so the lines do not drift. Finished
`vnext` work is promoted by merging `vnext` into `master`, which carries the
version value along with the feature work. Both directions use a real merge
commit — **never squash or rebase a cross-line merge**, because that destroys
the merge base and the same commits resurface as conflicts on the next sync.

## Feature flags

Product feature flags are **git config** keys under the `gvfs.` prefix (not a
Expand Down
Loading