You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mnemonic.apache.org by ga...@apache.org on 2017/07/20 22:48:23 UTC
incubator-mnemonic-site git commit: MNEMONIC-309: Add host Git
commands to Submit Changes Page
Repository: incubator-mnemonic-site
Updated Branches:
refs/heads/master 6bb476444 -> 1bb16966f
MNEMONIC-309: Add host Git commands to Submit Changes Page
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic-site/commit/1bb16966
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic-site/tree/1bb16966
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic-site/diff/1bb16966
Branch: refs/heads/master
Commit: 1bb16966fc1d95338e5796f53ac7eedb5daa6c6d
Parents: 6bb4764
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Thu Jul 20 15:47:29 2017 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Thu Jul 20 15:47:29 2017 -0700
----------------------------------------------------------------------
src/_docs/submitchanges.md | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic-site/blob/1bb16966/src/_docs/submitchanges.md
----------------------------------------------------------------------
diff --git a/src/_docs/submitchanges.md b/src/_docs/submitchanges.md
index 6f79638..762b277 100644
--- a/src/_docs/submitchanges.md
+++ b/src/_docs/submitchanges.md
@@ -11,6 +11,7 @@ submit your code/comments and document changes.
* Review your changes according to the JIRA ticket in question
* Building project in the Docker container
```bash
+ ## for Docker container
# cd /ws/incubator-mnemonic
# mvn clean install
```
@@ -22,22 +23,41 @@ submit your code/comments and document changes.
for Intellij IDEA, please refer to [Committing Changes to a Local Git Repository](https://www.jetbrains.com/help/idea/committing-changes-to-a-local-git-repository.html){:target="_blank"}<br/>
Please use JIRA id and title to fill up the comment of commit<br/>
for example
-```
- MNEMONIC-301: Improve the documentation of architecture page
+```bash
+ ## for host
+ # git commit -m "MNEMONIC-301: Improve the documentation of architecture page"
```
* Run all test cases if your changes could impact existing functionalities<br/>
Note: Please make sure enough available space for test data generation (>30G)
```bash
+ ## for Docker container
# cd /ws/incubator-mnemonic
# bin/runall.sh
```
* Resolve any problems found by test cases and then **amend** your previous commit in IDE<br/>
for Intellij IDEA, please refer to [Committing Changes to a Local Git Repository](https://www.jetbrains.com/help/idea/committing-changes-to-a-local-git-repository.html){:target="_blank"}
+```bash
+ ## for host
+ # git commit --amend
+```
* Make sure there is only 1 local commit for each JIRA ticket, otherwise please squash them into one
* Rebase your codebase before pushing local commits to your remote repository
1. fetch update from remote [Fetching Changes](https://www.jetbrains.com/help/idea/fetching-changes-from-a-remote-git-repository.html){:target="_blank"}
+ ```bash
+ ## for host
+ # git fetch -a
+ ```
2. Rebase your changes onto upstream/master [Rebasing Branches](https://www.jetbrains.com/help/idea/rebasing-branches.html){:target="_blank"}
+ ```bash
+ ## for host
+ # git rebase upstream/master
+ ```
* Push local commits to your remote repository [Pushing Changes](https://www.jetbrains.com/help/idea/pushing-changes-to-the-upstream-git-push.html){:target="_blank"}
+```bash
+ ## for host
+ # git push origin
+ ## NOTE: use force push if your amended commit has already been pushed
+```
* Create a PR in Github [Creating a pull request](https://help.github.com/articles/creating-a-pull-request/){:target="_blank"}
* Fix any issues come from community review
* Change the JIRA ticket status to RESOLVED if the button exists