Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c019c7b

Browse filesBrowse files
committed
DOC: document how to backport a PR
1 parent f6f9c8c commit c019c7b
Copy full SHA for c019c7b

File tree

Expand file treeCollapse file tree

1 file changed

+24
-0
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+24
-0
lines changed

‎doc/devel/coding_guide.rst

Copy file name to clipboardExpand all lines: doc/devel/coding_guide.rst
+24Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,30 @@ PR Review guidelines
183183
* Be patient with new contributors.
184184

185185

186+
Backports
187+
=========
188+
189+
190+
When doing back ports please include the branch you backported the
191+
commit to along with the SHA in a comment on the original PR.
192+
193+
A quick guide to how to back port a merge commit::
194+
195+
git remote update
196+
git checkout target_branch
197+
git merge --ff-only matplotlib/target_branch
198+
git cherry-pick -m 1 TARGET_SHA
199+
gitk # to look at it
200+
# local tests? (use your judgment)
201+
git push DANGER target_branch
202+
# leave a comment on PR noting sha of the resulting commit
203+
# from the cherry-pick + branch it was moved to
204+
205+
here matplotlib is a read-only remote to the matplotlib/matplotlib repo and DANGER in a read/write remote to the matplotlib/matplotlib repo.
206+
207+
These commands work on git 2.7.1.
208+
209+
186210
Style guide
187211
===========
188212

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.