125 Commits

Author SHA1 Message Date
ac14141228 chore(release): 2.0.0 2.0.0 2026-01-13 09:55:05 +00:00
85675526bc Merge pull request #31 from jimeh/rework-common-flow-v2 2026-01-13 09:50:28 +00:00
f763dabb0b fix(spec): improve RFC 2119 keyword consistency
- Change "IS NOT" to lowercase (not an RFC 2119 keyword)
- Change "you can update" to "you MAY update" in section 3.9
- Capitalize "should" to "SHOULD" in sections 8.7 and 9.6
- Remove ".x" suffix naming variant from long-term release branches
2026-01-12 09:09:37 +00:00
e38a08b265 feat(releases): allow release tags on merge commits for PR-based releases
Add support for release pull requests as an optional workflow. When
usingrelease PRs, the release tag SHOULD be placed on the resulting
merge commitrather than the version bump commit itself.

Changes:

- Add new item 7.5 defining release pull requests
- Update item 7.4 to reference the release PR exception
- Update item 8.6 to allow tagging merge commits for release branch PRs
- Renumber items 7.5-7.9 to 7.6-7.10
2026-01-12 08:59:11 +00:00
27fafc85e4 refactor(spec): reorder specification sections for better flow
Move Git Best Practices from section 10 to section 5, placing it after
Pull Requests and before Versioning. This positions best practices for
commits, rebasing, and force-pushing earlier in the document where they
are more relevant to daily development work.

- Renumber sections 5-9 to 6-10
- Update cross-reference in section 7.2 (section 5.1 → 6.1)
- Normalize "Long-term" to "Long-Term" for consistency
2026-01-12 08:59:11 +00:00
89094a20a0 feat(faq): add guidance for handling monorepos
Expand FAQ section to provide clear strategies for managing monorepos
using Common-Flow. Cover key considerations such as branch management,
versioning approaches, and maintaining consistency across packages.
2026-01-12 08:59:11 +00:00
798ef4fced chore(format): convert markdown headings to atx-style
refactor markdown formatting in the common-flow.md document by:
- Replacing setext-style headings with atx-style headings
- Maintaining overall document structure and readability
2026-01-12 08:59:11 +00:00
b0a7633162 feat: initial set of rework to prepare a v2 of Common-Flow 2026-01-12 08:59:11 +00:00
f4af7ce21d Merge pull request #30 from jimeh/update-link-urls 2026-01-10 18:39:57 +00:00
c471aa9b37 fix(links): update link URLs
Update links to newer URLs, so they no longer point to dead URLs.
2026-01-10 18:23:59 +00:00
f1eae76bd0 Merge pull request #29 from jimeh/wording-formatting-improvements 2026-01-10 07:30:02 +00:00
c1aceee08a chore: minor wording and formatting improvements 2026-01-10 07:29:24 +00:00
155c354c50 Merge pull request #28 from jimeh/update-force-with-lease-link 2026-01-10 07:13:14 +00:00
ed5db9db18 fix(best-practices): replace force-with-lease article link
Replace the dead Atlassian blog link with a newer and more comprehensive
explanation of `git push --force-with-lease`, providing clearer context
for developers about this important git workflow practice.
2026-01-10 07:12:07 +00:00
5c18e04f90 Merge pull request #27 from jimeh/conventional-commits-guidelines 2026-01-10 07:00:47 +00:00
06d46881da feat(commits): update commit message guidelines to use conventional commits
Update guidelines for commit messages to recommend Conventional
Commits specification. Clarify best practices for version bumps,
breaking changes, and semantic versioning alignment. Emphasize
benefits of structured commit messages for changelog generation
and automated version determination.
2026-01-10 06:59:35 +00:00
12daa305b3 Merge pull request #26 from jimeh/update-branch-terminology 2026-01-10 06:54:29 +00:00
613f707ffe feat(terminology): replace "master" with "main" branch terminology
Update documentation to use "main" branch instead of "master" branch
throughout the document. This change reflects modern conventions.
2026-01-10 06:53:42 +00:00
be5f5dd71b Bump version to 1.0.0-rc.5 1.0.0-rc.5 2018-05-04 13:22:39 +01:00
db0232e3d2 Fix grammatical error 2018-05-04 13:21:47 +01:00
849d11e478 Move up Summary section above Terminology 2018-05-03 14:07:22 +01:00
b12361f619 Add an additional descriptive branch name example 2018-01-30 13:02:29 +00:00
d4f4f88009 Improve wording of Summary section 2018-01-30 13:02:17 +00:00
4c68267fb2 Add proper Summary section 2017-12-29 01:33:03 +00:00
b7a264b37a Rename Summary section to Introduction 2017-12-29 01:32:42 +00:00
4f6b8f8e15 Improve grammar and clarify reason for using PR's for help/feedback 2017-12-29 01:32:02 +00:00
aa896fa87d Minor rewording 2017-12-29 01:31:20 +00:00
af2ed13214 Update FAQ about descriptive names with ticket number recommendation 2017-12-29 01:30:31 +00:00
7cef6f71cc Change "off of" to "from", fixing #19 2017-12-28 21:40:47 +00:00
6f08b0e41c Merge pull request #16 from jimeh/update-license
Update CC BY license from 3.0 to 4.0
2017-10-08 13:54:32 +01:00
bfc57413ef Update CC BY license from 3.0 to 4.0 2017-10-08 13:48:52 +01:00
0388ab8ecb Update link to author's website. 2017-10-08 13:43:48 +01:00
9ee29c7e2a Bump version to 1.0.0-rc.4 1.0.0-rc.4 2017-08-29 02:02:52 +01:00
6bacc41545 Merge pull request #5 from jimeh/add-faq-section
Add FAQ Section
2017-08-29 01:58:23 +01:00
5f9513df4d Fix typo 2017-08-29 01:56:02 +01:00
741dda313e Improve grammar of descriptive name FAQ question 2017-08-29 01:56:02 +01:00
f4da274468 Fix typo 2017-08-29 01:56:02 +01:00
d3e6630e2e Improve style of FAQ section 2017-08-29 01:56:02 +01:00
6735136a5d Add answer to hotfix with broken master FAQ question 2017-08-29 01:56:02 +01:00
77332f5f9a Add answer to "what does describe name mean?" FAQ question 2017-08-29 01:56:02 +01:00
68e0502dac Add Common-Flow vs GitHub Flow FAQ question 2017-08-29 01:56:01 +01:00
927a00a7bd Add answer to Common-Flow vs Git Flow FAQ question 2017-08-29 01:56:01 +01:00
34cb2c20e0 Add Git Flow question 2017-08-29 01:56:01 +01:00
f7170875d0 Start work on FAQ section 2017-08-29 01:56:01 +01:00
6a56ee1c40 Merge pull request #13 from jimeh/allow-rebase-or-merge-update
Allow updating change branches via rebase or merge
2017-08-29 01:54:33 +01:00
610d131dd5 Minor rewording 2017-08-27 00:15:39 +01:00
0b2cde114a Enforce change branch update via rebase, allow merge if really needed 2017-08-27 00:15:39 +01:00
4fd8d2f639 Allow updating change branches via rebase or merge
Allow for pulling in changes from the source branch either via
rabasing or merging, instead of only allowing rebasing. Rebasing is
still recommended however.
2017-08-27 00:15:39 +01:00
5cecf7dd84 Update terminology section to reflect recent changes to spec 2017-08-27 00:14:25 +01:00
045eded571 Swap order of "git add -i" and "git add -p"
Using the -p option is a shorthand to get into the patch section of
interactive mode. Hence the -i option is the main one to use.
2017-08-26 20:45:39 +01:00