master vs release contributing #945

New Issue

OVERLORD · 2026-02-04T23:05:56+03:00

OVERLORD commented

2026-02-04 23:05:56 +03:00

Originally created by @ezzra on GitHub (Dec 10, 2018).

The Readme states

All development on BookStack is currently done on the master branch. When it's time for a release the master branch is merged into release

but actually, branch release is 129 commits ahead master. Shouldn't the most recent code be located in master?

Originally created by @ezzra on GitHub (Dec 10, 2018). The Readme states > All development on BookStack is currently done on the master branch. When it's time for a release the master branch is merged into release but actually, branch `release` is 129 commits ahead `master`. Shouldn't the most recent code be located in master?

OVERLORD added the ❓ Question label 2026-02-04 23:05:56 +03:00

OVERLORD closed this issue

2026-02-04 23:05:58 +03:00

OVERLORD commented

2026-02-04 23:06:00 +03:00

@ssddanbrown commented on GitHub (Dec 10, 2018):

Hi @ezzra,
master does contain the development branch of code. For releases, the master branch is merged into release, The version is set and the CSS/JS files are built.
The 129 commits ahead you're seeing on release are just version bumps and CSS/JS build updates.

Usually master will be ahead but recent development work, since the last release, has been done on separate branches. master will always contain matching or more recent source code.

The network graph helps visualise this strategy.

@ssddanbrown commented on GitHub (Dec 10, 2018): Hi @ezzra, `master` does contain the development branch of code. For releases, the master branch is merged into `release`, The version is set and the CSS/JS files are built. The 129 commits ahead you're seeing on `release` are just version bumps and CSS/JS build updates. Usually `master` will be ahead but recent development work, since the last release, has been done on separate branches. `master` will always contain matching or more recent source code. The [network graph](https://github.com/BookStackApp/BookStack/network) helps visualise this strategy.

OVERLORD commented

2026-02-04 23:06:04 +03:00

@ezzra commented on GitHub (Dec 10, 2018):

ok thanks, I was just confused by the high number of ahead commits, but I got the picture now :)

@ezzra commented on GitHub (Dec 10, 2018): ok thanks, I was just confused by the high number of ahead commits, but I got the picture now :)

OVERLORD referenced this issue

2026-02-05 10:15:47 +03:00

[PR #945] [MERGED] Added Arabic language #5740

Sign in to join this conversation.