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

Jump to bottom

Minor fixes and PR doc #18

Merged
merged 3 commits into from
Jul 24, 2023
Merged

Minor fixes and PR doc #18

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
0abecd7
Adding missing sphinxcontrib-jquery requirement
ShutdownRepo Jun 7, 2023
65d71c5
Adding git commands for PR synchronizing
ShutdownRepo Jun 7, 2023
401133a
Updating PR synchronizing commands
ShutdownRepo Jul 20, 2023
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
3 changes: 2 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
myst_parser
sphinx_rtd_theme
sphinx-tabs
sphinx-copybutton
sphinx-copybutton
sphinxcontrib-jquery
19 changes: 18 additions & 1 deletion source/community/maintainers.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,4 +405,21 @@ _____________

When there's not enough

You are running out of disk space. The runner will stop working when the machine runs out of disk space. Free space left: 62 MB
You are running out of disk space. The runner will stop working when the machine runs out of disk space. Free space left: 62 MB


Pull Requests
=============

When handling pull requests, maintainers may need to `synchronize a contributor's fork with latests changes <https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork>`_. In command-line, this can be achieved as follows.

.. code-block:: bash

git clone "git@github.com:USER/FORK" "dest_dir"
cd dest_dir
git remote add upstream "git@github.com:ThePorgs/REPO"
git fetch upstream
git checkout "TARGET_FORK_BRANCH"
git merge --no-edit upstream/"ORIGIN_BRANCH"
# solve conflicts if any
git push
Loading