mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-26 16:51:46 -07:00
Code Issues Projects Releases Wiki Activity

Clarifying what i mean by "basic competence with git".

Browse source
This commit is contained in:
Richard Brooksby 2023-01-26 07:45:00 +00:00
parent e4d63ef7a4
commit ffcd37a233
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mps/procedure/pull-request-merge.rst
View file

@ -148,8 +148,8 @@ by considering `2. Purpose`_.
These steps will only rarely need repeating.
#. You need basic competence with Git: enough to understand the
commands in `the merging procedure`_.
#. You need basic competence with Git: enough to understand what the
commands in `the merging procedure`_ do.
#. If the merge has conflicts, you will need competence in using Git
to resolve merge conflicts.