Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak Page Headings #253

Merged
merged 3 commits into from
Sep 23, 2024
Merged

Tweak Page Headings #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
378d411
fix trunk status links/instructions
jennyhickson Sep 23, 2024
dacd2ac
Merge branch 'main' into tweak_review_instructions
jennyhickson Sep 23, 2024
f79a935
improve capitalisation
jennyhickson Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions source/Reviewers/howtocommit.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _howtocommit:

How To Commit
=============
Merge, Test & Commit
====================

The process for committing a ticket follows this sequence with details for each of these steps outlined below.

Expand All @@ -12,8 +12,7 @@ The process for committing a ticket follows this sequence with details for each
Before You Start:
* Is anyone else committing?

* `Trunk Status`_ is used to coordinate trunk commits for UM, JULES, LFRic Apps and UKCA.
* LFRic Core Trunk commits are coordinated through the dashboard in the Model Systems Teams Chat.
* `Trunk Status`_ is used to coordinate trunk commits all projects.
* Simple, not conflicting commits can be done in parallel if reviewers all agree.
* Changes with KGO or Macros usually require sole access to the trunk.
* Check how many commits have happened today. Suggested limit per day, per repository is 4.
Expand Down Expand Up @@ -613,4 +612,4 @@ If something is broken:
At this point you will be in UMDIR on the platform SPICE. You can then access frum on other machines via ssh -Y <HOSTNAME>.
* Apart from on SPICE the frum home directories and UMDIR are separate. XCE/F share the same UMDIR and the UMDIR on XCS is kept in sync with this one.

.. _Trunk Status: https://code.metoffice.gov.uk/trac/um/wiki/TrunkStatus
.. _Trunk Status: https://code.metoffice.gov.uk/trac/lfric_apps/wiki/TrunkStatus
4 changes: 2 additions & 2 deletions source/WorkingPractices/branches.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Create a branch
===============
Create & Checkout a Branch
==========================
The source management tool is `FCM <http://metomi.github.io/fcm/doc/>`_, which is based on subversion
but with some subtle differences, both of which are very different from git.

Expand Down
2 changes: 1 addition & 1 deletion source/WorkingPractices/tickets.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.. _ticket:

Create a ticket
Create a Ticket
===============
Every change requires an associated ticket. This helps the developer
organise and document their work and the reviewers to perform and
Expand Down