This is an automated email from the ASF dual-hosted git repository.
garyw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mnemonic-site.git
The following commit(s) were added to refs/heads/master by this push:
new 9410c2c MNEMONIC-362: Update Jetbrains github user guide links
new 7ec195c Merge pull request #3 from djkevincr/MNEMONIC-362
9410c2c is described below
commit 9410c2c5b978b47f84470af493e6fb208e25ae04
Author: Kevin Ratnasekera <[email protected]>
AuthorDate: Tue Feb 26 13:32:07 2019 +0530
MNEMONIC-362: Update Jetbrains github user guide links
---
src/_docs/submitchanges.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/_docs/submitchanges.md b/src/_docs/submitchanges.md
index acc3669..4722717 100644
--- a/src/_docs/submitchanges.md
+++ b/src/_docs/submitchanges.md
@@ -20,7 +20,7 @@ submit your code/comments and document changes.
* Resolve any problems found by your test cases
* Add your test cases to *bin/test.conf*
* Commit the changes to your local repository 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"}<br/>
+ for Intellij IDEA, please refer to [Committing Changes to a Local Git
Repository](https://www.jetbrains.com/help/idea/commit-and-push-changes.html#commit){:target="_blank"}<br/>
Please use JIRA id and title to fill up the comment of commit<br/>
for example
```bash
@@ -35,24 +35,24 @@ Note: Please make sure enough available space for test data
generation (>30G)
# 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"}
+ for Intellij IDEA, please refer to [Committing Changes to a Local Git
Repository](https://www.jetbrains.com/help/idea/commit-and-push-changes.html#commit){: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"}
+ 1. fetch update from remote [Fetching
Changes](https://www.jetbrains.com/help/idea/sync-with-a-remote-repository.html#fetch){: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"}
+ 2. Rebase your changes onto upstream/master [Rebasing
Branches](https://www.jetbrains.com/help/idea/apply-changes-from-one-branch-to-another.html#rebase-branch){: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"}
+* Push local commits to your remote repository [Pushing
Changes](https://www.jetbrains.com/help/idea/commit-and-push-changes.html#push){:target="_blank"}
```bash
## for host
# git push origin
