Skip to content

Commit

Permalink
Modify PR example.
Browse files Browse the repository at this point in the history
  • Loading branch information
lollipopjin committed Dec 29, 2016
1 parent 647debd commit e268fd1
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions _docs/06-best-practice-pull-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ Note on squashing: Since squash discards remote branch history, repeated PRs fro
# Closing a PR without committing (for committers)
When we want to reject a PR (close without committing), we can just issue an empty commit on master's HEAD without merging the PR:

git commit --allow-empty -m "closes apache/incubator-rocketmq#ZZ *Won't fix*"
git commit --allow-empty -m "ROCKETMQ-XXXX closes apache/incubator-rocketmq#ZZ *Won't fix*"
git push apache master

that should close PR ZZ on github mirror without merging and any code modifications in the master repository.more detail please refer to RocketMQ PR https://github.com/apache/incubator-rocketmq/pull/1
that should close PR ZZ on github mirror without merging and any code modifications in the master repository.more detail please refer to RocketMQ PR https://github.com/apache/incubator-rocketmq/pull/15


# Apache/github integration features
Expand Down
2 changes: 1 addition & 1 deletion content/about/contact/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@


<meta property="og:type" content="article">
<meta property="article:published_time" content="2016-12-29T13:27:14+08:00">
<meta property="article:published_time" content="2016-12-29T14:51:32+08:00">



Expand Down
2 changes: 1 addition & 1 deletion content/about/team/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@


<meta property="og:type" content="article">
<meta property="article:published_time" content="2016-12-29T13:27:14+08:00">
<meta property="article:published_time" content="2016-12-29T14:51:32+08:00">



Expand Down
2 changes: 1 addition & 1 deletion content/docs/cli-admin-tool/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@


<meta property="og:type" content="article">
<meta property="article:published_time" content="2016-12-29T13:27:14+08:00">
<meta property="article:published_time" content="2016-12-29T14:51:32+08:00">



Expand Down
2 changes: 1 addition & 1 deletion content/docs/cluster-deployment/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@


<meta property="og:type" content="article">
<meta property="article:published_time" content="2016-12-29T13:27:14+08:00">
<meta property="article:published_time" content="2016-12-29T14:51:32+08:00">



Expand Down
2 changes: 1 addition & 1 deletion content/docs/code-guidelines/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@


<meta property="og:type" content="article">
<meta property="article:published_time" content="2016-12-29T13:27:14+08:00">
<meta property="article:published_time" content="2016-12-29T14:51:32+08:00">



Expand Down
2 changes: 1 addition & 1 deletion content/docs/core-concept/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@


<meta property="og:type" content="article">
<meta property="article:published_time" content="2016-12-29T13:27:14+08:00">
<meta property="article:published_time" content="2016-12-29T14:51:32+08:00">



Expand Down
2 changes: 1 addition & 1 deletion content/docs/motivation/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@


<meta property="og:type" content="article">
<meta property="article:published_time" content="2016-12-29T13:27:14+08:00">
<meta property="article:published_time" content="2016-12-29T14:51:32+08:00">



Expand Down
6 changes: 3 additions & 3 deletions content/docs/pull-request/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@


<meta property="og:type" content="article">
<meta property="article:published_time" content="2016-12-29T13:27:14+08:00">
<meta property="article:published_time" content="2016-12-29T14:51:32+08:00">



Expand Down Expand Up @@ -504,12 +504,12 @@ <h1 id="merging-a-pr-yours-or-contributors">Merging a PR (yours or contributors)
<h1 id="closing-a-pr-without-committing-for-committers">Closing a PR without committing (for committers)</h1>
<p>When we want to reject a PR (close without committing), we can just issue an empty commit on master’s HEAD without merging the PR:</p>

<div class="highlighter-rouge"><pre class="highlight"><code>git commit --allow-empty -m "closes apache/incubator-rocketmq#ZZ *Won't fix*"
<div class="highlighter-rouge"><pre class="highlight"><code>git commit --allow-empty -m "ROCKETMQ-XXXX closes apache/incubator-rocketmq#ZZ *Won't fix*"
git push apache master
</code></pre>
</div>

<p>that should close PR ZZ on github mirror without merging and any code modifications in the master repository.more detail please refer to RocketMQ PR https://github.com/apache/incubator-rocketmq/pull/1</p>
<p>that should close PR ZZ on github mirror without merging and any code modifications in the master repository.more detail please refer to RocketMQ PR https://github.com/apache/incubator-rocketmq/pull/15</p>

<h1 id="apachegithub-integration-features">Apache/github integration features</h1>

Expand Down
2 changes: 1 addition & 1 deletion content/docs/quick-start/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@


<meta property="og:type" content="article">
<meta property="article:published_time" content="2016-12-29T13:27:14+08:00">
<meta property="article:published_time" content="2016-12-29T14:51:32+08:00">



Expand Down
2 changes: 1 addition & 1 deletion content/feed.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" href="/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="http://jekyllrb.com" version="3.3.1">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2016-12-29T13:27:14+08:00</updated><id>//</id><title type="html">Apache RocketMQ</title><subtitle>The homepage of RocketMQ.</subtitle><author><name>{&quot;name&quot;=&gt;nil, &quot;avatar&quot;=&gt;&quot;/assets/images/rmq-logo.png&quot;, &quot;bio&quot;=&gt;&quot;A fast, low latency, reliable, scalable, distributed MOM.&quot;, &quot;location&quot;=&gt;&quot;Hangzhou, China&quot;, &quot;email&quot;=&gt;&quot;[email protected]&quot;, &quot;uri&quot;=&gt;&quot;http://incubator.staging.apache.org/projects/rocketmq.html&quot;, &quot;bitbucket&quot;=&gt;nil, &quot;codepen&quot;=&gt;nil, &quot;dribbble&quot;=&gt;nil, &quot;flickr&quot;=&gt;nil, &quot;facebook&quot;=&gt;nil, &quot;foursquare&quot;=&gt;nil, &quot;github&quot;=&gt;&quot;apache/incubator-rocketmq&quot;, &quot;google_plus&quot;=&gt;nil, &quot;keybase&quot;=&gt;nil, &quot;instagram&quot;=&gt;nil, &quot;lastfm&quot;=&gt;nil, &quot;linkedin&quot;=&gt;nil, &quot;pinterest&quot;=&gt;nil, &quot;soundcloud&quot;=&gt;nil, &quot;stackoverflow&quot;=&gt;&quot;http://stackoverflow.com/questions/tagged/rocketmq&quot;, &quot;steam&quot;=&gt;nil, &quot;tumblr&quot;=&gt;nil, &quot;twitter&quot;=&gt;&quot;ApacheRocketMQ&quot;, &quot;vine&quot;=&gt;nil, &quot;weibo&quot;=&gt;nil, &quot;xing&quot;=&gt;nil, &quot;youtube&quot;=&gt;nil, &quot;quora&quot;=&gt;&quot;topic/RocketMQ&quot;}</name><email>[email protected]</email><uri>http://incubator.staging.apache.org/projects/rocketmq.html</uri></author><entry><title type="html">Mastering Component Compatible Dependency</title><link href="/maven/mastering-component-compatible-dependency/" rel="alternate" type="text/html" title="Mastering Component Compatible Dependency" /><published>2016-12-23T00:00:00+08:00</published><updated>2016-12-23T00:00:00+08:00</updated><id>/maven/mastering-component-compatible-dependency</id><content type="html" xml:base="/maven/mastering-component-compatible-dependency/">&lt;p&gt;This article mainly includes three parts.at first,I will introduce compatibility principle(more details see &lt;a href=&quot;http://blog.csdn.net/fengjia10/article/details/7799227&quot;&gt;here&lt;/a&gt;) briefly.followed by a detailed elaborating about Java component compatible dependency,including the interface-oriented programming,single component signature protection,single component compatibility protection and multi-component compatibility compile time checking.Finally is the review and prospect,especially about &lt;strong&gt;Dependency Mediator&lt;/strong&gt; project.&lt;/p&gt;
<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" href="/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="http://jekyllrb.com" version="3.3.1">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2016-12-29T14:51:32+08:00</updated><id>//</id><title type="html">Apache RocketMQ</title><subtitle>The homepage of RocketMQ.</subtitle><author><name>{&quot;name&quot;=&gt;nil, &quot;avatar&quot;=&gt;&quot;/assets/images/rmq-logo.png&quot;, &quot;bio&quot;=&gt;&quot;A fast, low latency, reliable, scalable, distributed MOM.&quot;, &quot;location&quot;=&gt;&quot;Hangzhou, China&quot;, &quot;email&quot;=&gt;&quot;[email protected]&quot;, &quot;uri&quot;=&gt;&quot;http://incubator.staging.apache.org/projects/rocketmq.html&quot;, &quot;bitbucket&quot;=&gt;nil, &quot;codepen&quot;=&gt;nil, &quot;dribbble&quot;=&gt;nil, &quot;flickr&quot;=&gt;nil, &quot;facebook&quot;=&gt;nil, &quot;foursquare&quot;=&gt;nil, &quot;github&quot;=&gt;&quot;apache/incubator-rocketmq&quot;, &quot;google_plus&quot;=&gt;nil, &quot;keybase&quot;=&gt;nil, &quot;instagram&quot;=&gt;nil, &quot;lastfm&quot;=&gt;nil, &quot;linkedin&quot;=&gt;nil, &quot;pinterest&quot;=&gt;nil, &quot;soundcloud&quot;=&gt;nil, &quot;stackoverflow&quot;=&gt;&quot;http://stackoverflow.com/questions/tagged/rocketmq&quot;, &quot;steam&quot;=&gt;nil, &quot;tumblr&quot;=&gt;nil, &quot;twitter&quot;=&gt;&quot;ApacheRocketMQ&quot;, &quot;vine&quot;=&gt;nil, &quot;weibo&quot;=&gt;nil, &quot;xing&quot;=&gt;nil, &quot;youtube&quot;=&gt;nil, &quot;quora&quot;=&gt;&quot;topic/RocketMQ&quot;}</name><email>[email protected]</email><uri>http://incubator.staging.apache.org/projects/rocketmq.html</uri></author><entry><title type="html">Mastering Component Compatible Dependency</title><link href="/maven/mastering-component-compatible-dependency/" rel="alternate" type="text/html" title="Mastering Component Compatible Dependency" /><published>2016-12-23T00:00:00+08:00</published><updated>2016-12-23T00:00:00+08:00</updated><id>/maven/mastering-component-compatible-dependency</id><content type="html" xml:base="/maven/mastering-component-compatible-dependency/">&lt;p&gt;This article mainly includes three parts.at first,I will introduce compatibility principle(more details see &lt;a href=&quot;http://blog.csdn.net/fengjia10/article/details/7799227&quot;&gt;here&lt;/a&gt;) briefly.followed by a detailed elaborating about Java component compatible dependency,including the interface-oriented programming,single component signature protection,single component compatibility protection and multi-component compatibility compile time checking.Finally is the review and prospect,especially about &lt;strong&gt;Dependency Mediator&lt;/strong&gt; project.&lt;/p&gt;

&lt;aside class=&quot;sidebar__right&quot;&gt;
&lt;nav class=&quot;toc&quot;&gt;
Expand Down

0 comments on commit e268fd1

Please sign in to comment.