Skip to content

Commit

Permalink
fixup! docs(MAINTAINERS): Elaborate on todo list modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
gibson042 committed Apr 26, 2024
1 parent 34cd15f commit dccb13b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ For each set of changes to include:
- If encountering a commit with conflicts that do not have a straightforward resolution, check if picking any prior commit would help resolve the conflicts.
- Abort the rebase, update the authored `rebase-todo`, and restart the interactive rebase.
- Avoid authoring manual changes unless absolutely necessary. If authoring changes, keep them as separate commits and indicate them as such on the authored rebase todo (insert either a `pick` instruction with the id of the commit you just authored or an `exec` instruction that makes the modifications and ends with `git commit -m $message`, in either case prefixing with an explanatory `##` comment).
- For `exec`, make portable in-place edits with either `ed` or `sed-i () { if sed --help 2>&1 | sed 2q | grep -qe '-i '; then sed -i '' "$@"; else sed -i "$@"; fi; }`, e.g. `printf 'H\n/\( *\)foo/ s##\\1// prettier-ignore\\\n&#\nw\n' | ed -s packages/path/to/file'` or `sed-i -E "$(printf 's#( *)foo#\\1// prettier-ignore\\\n&#')" packages/path/to/file`.
- For `exec`, make portable in-place edits with either `ed` or `alias sed-i="sed -i $(sed --help 2>&1 | sed 2q | grep -qe '-i ' && echo "''")"`, e.g. `printf 'H\n/\( *\)foo/ s##\\1// prettier-ignore\\\n&#\nw\n' | ed -s packages/path/to/file'` or `sed-i -E "$(printf 's#( *)foo#\\1// prettier-ignore\\\n&#')" packages/path/to/file`.
- If a commit is empty, skip it and comment it out in the rebase todo.
- [ ] Verify that tests pass. In particular:
- Linting locally can catch incompatibilities in the cherry-pick, often requiring some changes to be reverted or more commits from `master` to be included. In those cases, update the authored `rebase-todo`, and redo the interactive rebase as necessary.
Expand Down

0 comments on commit dccb13b

Please sign in to comment.