Repository navigation
chore: merge master back into develop after 2.0.0 - #338
Merged
Merged
Conversation
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Brings
masterback intodevelopafter the 2.0.0 release (#336).The project uses git-flow: work is merged into
develop, releases go tomaster, and each release is then merged back intodevelop, so thatdevelopalways contains what was released and the next release merges intomastercleanly.This branch, made from
develop, holds one merge ofmaster. 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 inREADME.md,docs/.../getting-started/installation.mdanddocs/.../guides/scripts-and-ci.md.develophad changed the same lines on its own for 1.1.0 (7fba128), from the same starting point. Each conflict takesmaster's version.Other Informations
Review: after this merge,
developandmasterhold the same files:git diff origin/master chore/merge-master-into-develop-2.0.0is empty.develophad no change thatmasterlacked, so nothing ondevelopis lost.Merging: use a merge commit, not a squash. A squash would leave
master's commits out ofdevelop's history, and the next release would conflict again.Tests: no code changes; CI runs the usual checks.