Skip to content

chore: merge master back into develop after 2.0.0 - #338

Merged
mindsers merged 10 commits into
developfrom
chore/merge-master-into-develop-2.0.0
Oct 28, 2026
Merged

mindsers merged 10 commits into
developfrom
chore/merge-master-into-develop-2.0.0

Conversation

@mindsers

Copy link
Copy Markdown
Owner

Summary

Brings master back into develop after the 2.0.0 release (#336).

The project uses git-flow: work is merged into develop, releases go to master, and each release is then merged back into develop, so that develop always contains what was released and the next release merges into master cleanly.

This branch, made from develop, holds one merge of master. Five files conflicted, all on lines the release changed: package.json (the version), CHANGELOG.md (the release headings and links), and the npm install addresses in README.md, docs/.../getting-started/installation.md and docs/.../guides/scripts-and-ci.md. develop had changed the same lines on its own for 1.1.0 (7fba128), from the same starting point. Each conflict takes master's version.

Other Informations

Review: after this merge, develop and master hold the same files: git diff origin/master chore/merge-master-into-develop-2.0.0 is empty. develop had no change that master lacked, so nothing on develop is lost.

Merging: use a merge commit, not a squash. A squash would leave master's commits out of develop's history, and the next release would conflict again.

Tests: no code changes; CI runs the usual checks.

mindsers and others added 10 commits August 15, 2018 15:41
Update production support informations
Sets the version to 1.1.0, dates its changelog section, and points the npm install commands at its release.
…ntent

master holds 1.0.0 and its hotfixes as squashed commits, so it shares no history with develop after 0.3.1. Every version of a file on master is also in develop's history, where later work replaced it: master is recorded as merged, and its content not taken, so that release/1.1.0 merges into master without conflicts.
develop already had 1.1.0 from its own commit (7fba128), on the same lines that the 2.0.0 release changed: the version, the changelog headings, and the npm install addresses. The five conflicting files take master's version.
@mindsers
mindsers merged commit a70ee97 into develop Oct 28, 2026
11 checks passed
@mindsers
mindsers deleted the chore/merge-master-into-develop-2.0.0 branch October 28, 2026 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant