-
Notifications
You must be signed in to change notification settings - Fork 2
DadoFlow Patching an Old Version
Paul Mansour edited this page May 29, 2020
·
1 revision
To patch an old version, first create a new version branch from the existing version tag:
NewVersionBranch 'x.y.z'
Version x.y.z. must already exist. The patched version will be x.y.z+1, and must not already exist. Do whatever work necessary to implement the change, and commit the changes:
Commit ''
(Note that these changes will NOT be merged into the master.)
Then run ReleaseOldPatch
ReleaseOldPatch ''
This function will:
- Squash all new commits on the branch
- Build the package, application, and any other release artifacts
- Tag the commit
- Merge into the master using the merge strategy "ours" (-s ours)
- Delete the branch
- Push to GitHub
The merge strategy employed here places the tagged version commit on the master, and then a new merge commit that completely ignores the tagged version.
-
Reference
-
Projects, Packages, and Applications
-
DadoFlow: A Git Workflow
-
Philosophy and Other Nonsense