procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/notes/repo: Document feature and scratch branches.

Browse source
This commit is contained in:
Stefan Kangas 2022-10-22 12:15:49 +02:00
parent 55eabe96c9
commit 636322cfe0
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
admin/notes/repo
View file

@ -42,6 +42,24 @@ yet another fun excursion into the exciting world of version control.
https://lists.gnu.org/r/emacs-devel/2010-04/msg00086.html
* feature and scratch branches
Besides the master branch, which is where development takes place, and
the "emacs-NN" release branches, we also have branches whose names
start with "scratch/" and "feature/". The "feature/" prefix is used
for feature branches that are intended to live for some time, while
"scratch/" is for one-off throw-away-after-use branches.
We do not intend to "git merge" from scratch branches, so force-pushes
are tolerated, as well as commits with poor style, incomplete commit
messages, etc.
We do expect to "git merge" from feature branches so: no force push,
and no commits that don't have a proper commit message.
Automatic tests are run for feature/* branches on EMBA.
See: https://emba.gnu.org/emacs/emacs/-/pipelines
* Installing changes from gnulib
Some of the files in Emacs are copied from gnulib. To synchronize