GitHub and Trunk - #482
Conversation
James Bruten (james-bruten-mo)
left a comment
James Bruten (james-bruten-mo)
left a comment
There was a problem hiding this comment.
Just a few suggestions. I realised partway down that you've put main in which is a nice idea for distinguishing it as special
| The change then passes to the Code Reviewer and in this stage the developer is | ||
| encouraged to merge ``main`` into their branch and resolve any conflicts. | ||
|
|
||
| Once the reviews are complete the code reviewer is then responsible for the |
There was a problem hiding this comment.
Not sure I like this sentence - it sounds like we're merging the branch into main, and also that the reviewer will solve all merge conflicts. Maybe,
Once the reviews are complete, the code reviewer is responsible for organising the final merge of ``main`` into the branch and committing. If merge conflicts are complex, the developer will be asked to complete these.
There was a problem hiding this comment.
added "and commit" to my original wording
Co-authored-by: James Bruten <109733895+james-bruten-mo@users.noreply.github.com>
Co-authored-by: James Bruten <109733895+james-bruten-mo@users.noreply.github.com>
Co-authored-by: James Bruten <109733895+james-bruten-mo@users.noreply.github.com>
Co-authored-by: James Bruten <109733895+james-bruten-mo@users.noreply.github.com>
Co-authored-by: James Bruten <109733895+james-bruten-mo@users.noreply.github.com>
Co-authored-by: James Bruten <109733895+james-bruten-mo@users.noreply.github.com>
Co-authored-by: James Bruten <109733895+james-bruten-mo@users.noreply.github.com>
Co-authored-by: James Bruten <109733895+james-bruten-mo@users.noreply.github.com>
Co-authored-by: James Bruten <109733895+james-bruten-mo@users.noreply.github.com>
|
Thanks - some good spots particularly around the paths - though I'm wondering if we need to make sure its clear which branch you should have open in the clones in those cases |
James Bruten (james-bruten-mo)
left a comment
James Bruten (james-bruten-mo)
left a comment
There was a problem hiding this comment.
I think all the paths were around release processes? In which case I think it should be reasonably obvious. But there's always going to be tinkering with these so we can clarify as necessary
4427a7e
into
MetOffice:github_wps
2 participants
As part of efforts for #440, this PR capitalises the uses of GitHub and replaces trunk with main or stable as appropriate.
There are some trunk references remaining - mostly in trac links, and the copy of the release notes template as they need handling differently.