<liclass="toctree-l2"><aclass="reference internal" href="MEP/MEP12.html">MEP12: Improve Gallery and Examples</a></li>
<liclass="toctree-l2"><aclass="reference internal" href="MEP/MEP13.html">MEP13: Use properties for Artists</a></li>
<liclass="toctree-l2"><aclass="reference internal" href="MEP/MEP14.html">MEP14: Text handling</a></li>
<liclass="toctree-l2"><aclass="reference internal" href="MEP/MEP15.html">MEP15: Fix axis autoscaling when limits are specified for one axis only</a></li>
<spanid="id1"></span><h1>Maintainer workflow<aclass="headerlink" href="#maintainer-workflow" title="Permalink to this heading">#</a></h1>
<p>This page is for maintainers — those of us who merge our own or other
peoples' changes into the upstream repository.</p>
<p>Being as how you're a maintainer, you are completely on top of the basic stuff
in <aclass="reference internal" href="development_workflow.html#development-workflow"><spanclass="std std-ref">Development workflow</span></a>.</p>
<p>The instructions in <aclass="reference external" href="https://docs.scipy.org/doc/scipy/dev/gitwash/development_setup.html#linking-to-upstream" title="(in SciPy v1.10.0)"><span>Linking your repository to the upstream repo</span></a> add a remote that has read-only
access to the upstream repo. Being a maintainer, you've got read-write access.</p>
<p>It's good to have your upstream remote have a scary name, to remind you that
<p>The merge will be detected by GitHub, and should close any related pull requests
automatically.</p>
<p>Note the <codeclass="docutils literal notranslate"><spanclass="pre">--no-ff</span></code> above. This forces git to make a merge commit, rather than
doing a fast-forward, so that these set of commits branch off trunk then rejoin
the main history with a merge, rather than appearing to have been made directly
on top of trunk.</p>
</section>
<sectionid="check-the-history">
<h3>Check the history<aclass="headerlink" href="#check-the-history" title="Permalink to this heading">#</a></h3>
<p>Now, in either case, you should check that the history is sensible and you have
<p>This pushes the <codeclass="docutils literal notranslate"><spanclass="pre">my-new-feature</span></code> branch in this repository to the <codeclass="docutils literal notranslate"><spanclass="pre">main</span></code>
branch in the <codeclass="docutils literal notranslate"><spanclass="pre">upstream-rw</span></code> repository.</p>