From 3f3190887646d2db2f123e7343e9ada94769a5e0 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 3 Jul 2017 15:39:54 +0100 Subject: [PATCH] Update links to be compatible with GitHub Pages --- common-flow.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/common-flow.md b/common-flow.md index 42ba133..f3785a5 100644 --- a/common-flow.md +++ b/common-flow.md @@ -83,13 +83,15 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). discuss the changes with others there. 3. Git Best Practices 1. All commit messages SHOULD follow the Commit Guidelines and format from - the official git documentation: - https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project + the official git + documentation: + 2. You SHOULD always use "--force-with-lease" when doing a force push. The - plain "--force" option is dangerous and destructive. More information: - https://developer.atlassian.com/blog/2015/04/force-with-lease/ - 3. You SHOULD understand and be comfortable with rebasing: - https://git-scm.com/book/en/v2/Git-Branching-Rebasing + plain "--force" option is dangerous and destructive. More + information: + + 3. You SHOULD understand and be comfortable with + rebasing: 4. It is RECOMMENDED that you always do "git pull --rebase" instead of "git pull" to avoid unnecessary merge commits. You can make this the default behavior of "git pull" with "git config --global pull.rebase true". @@ -104,9 +106,9 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). 2. If you are using a "VERSION" file in the root of the project, this MUST only contain the exact version string. 3. The version string SHOULD follow the Semantic Versioning - (http://semver.org/) format. Use of Semantic Versioning is OPTIONAL, but - the version string MUST NOT have a "v" prefix. For example "v2.11.4" is - bad, and "2.11.4" is good. + () format. Use of Semantic Versioning is OPTIONAL, + but the version string MUST NOT have a "v" prefix. For example "v2.11.4" + is bad, and "2.11.4" is good. 5. Releases 1. To create a new release, you MUST create a "version bump" commit directly on the master branch which changes the hard-coded version value of the