summary refs log tree commit diff
path: root/.gitattributes
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2024-05-08 12:29:59 +0100
committerChristopher Baines <mail@cbaines.net>2024-05-22 14:31:01 +0100
commit4955589f2f343e1862dfae7831d1fc548811d59b (patch)
treefbc9dfccd241beb39c77ddd86b1d028ff367a6e9 /.gitattributes
parentb462cff5ee582d09a0a6b656bea3b1e77c1f57a5 (diff)
downloadguix-4955589f2f343e1862dfae7831d1fc548811d59b.tar.gz
doc: Make changes to the handling of branches.
Require that you create a "Request to merge" issue when you create a branch,
rather than when you wish to merge it.  This should help avoid this step being
missed.

Also, add information on how to manage these branches:

 1. Suggest creating the branch from patches, rather than having a stateful
 branch, since this should help to reduce complexity and avoid merges.

 2. Require that branches don't have unnecessary changes, since this increases
 the risks of conflicts with other branches.

 3. Suggest that the branch not be stateful, and it's just a combination of
 patches.

 4. Suggest avoiding merges since these create a more complicated Git history.

 5. Suggest that the branch be up to date before merging, as this helps avoid
 the combination of master plus the branch differing significantly from the
 branch alone.

 6. Document how to manage branches without commit access.

Finally, require that the branch be deleted once they're merged.  This
prepares for the branch being created again.

* doc/contributing.texi (Managing Patches and Branches): Make changes to the
handling of branches.

Change-Id: Ib9419c6df94f485475bd6f147e82ea254e76cec2
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions