include images for contrib/branching

This commit is contained in:
Dustin J. Mitchell 2022-04-21 01:29:47 +00:00 committed by Tomas Babej
parent 18e11300fd
commit 04f4d3a68e
8 changed files with 14 additions and 14 deletions

View file

@ -13,7 +13,7 @@ Taskwarrior and Taskserver use the same branching model.
Git allows arbitrary and low-cost branching, which means that any branching model can be used.
A new Git repository has one branch, the default branch, named `master`, but even this is not required.
[![master](/docs/images/master.png)](/docs/images/master.png)
[![master](master.png)](master.png)
No development occurs on the `master` branch.
@ -24,7 +24,7 @@ A development branch is created from the `master` branch, and work proceeds on t
Development branches are pushed to the server.
Note that there are no changes on `master` - all work is done on dev branches.
[![dev](/docs/images/dev.png)](/docs/images/dev.png)
[![dev](dev.png)](dev.png)
All work on dev branches is pushed to the server.
@ -36,7 +36,7 @@ This can be a useful way to manage parallel efforts on a single development mach
Topic branches are also useful for merging in submitted patches, because the patch can be merged, tested and corrected independently of other efforts before being merged and pushed.
A topic branch is ideal for storage of changes before an eventual merge back to the development branch.
[![topic](/docs/images/topic.png)](/docs/images/topic.png)
[![topic](topic.png)](topic.png)
No topic branches are pushed to the server, they are kept local to the development machine.
They are private, and therefore hidden from the server.
@ -46,7 +46,7 @@ They are private, and therefore hidden from the server.
When a release is made, the development branch is merged back to the `master` branch, and a tag is applied that indicates which commit represents the release.
[![release](/docs/images/release.png)](/docs/images/release.png)
[![release](release.png)](release.png)
Because only releases are merged back, the `master` branch always represent the stable release.
@ -63,7 +63,7 @@ The second branch, with the higher release number is the development branch for
This is where all the work occurs.
Any fix made on the development branch can be cherry-picked onto the patch branch, if necessary.
[![dev2](/docs/images/dev2.png)](/docs/images/dev2.png)
[![dev2](dev2.png)](dev2.png)
To address the confusion around branching, namely determining which branch is active.
the answer is that the highest numbered branch is the one that patches should be applied to.

BIN
docs/contrib/dev.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
docs/contrib/dev2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
docs/contrib/master.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
docs/contrib/release.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
docs/contrib/topic.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB