Github user manuzhang commented on a diff in the pull request:
https://github.com/apache/incubator-gearpump/pull/1#discussion_r59964384
--- Diff: CONTRIBUTING.md ---
@@ -53,40 +137,242 @@ No work should ever be done in the forked master.
Another way to do this is to
You can also use this when you want to squash(merge) multiple commits
into one.
```git rebase -i``` will popup a window, which allow you to
squash(merge) multiple commits into one commit.
- For example I might have 12 commits in my branch. "rebase -i
upstream/master" opens a nice editor where you can mark some commits to be
squashed(merged) into prior commits, and make 1 big commit (or several) out of
it. In this way, I can tidy up what will be committed to the project master's
history since otherwise my commit messages are like "not working" or "got it
working" or "more fix" or "merged <git-user-id>/gearpump to master".
+ For example I might have 12 commits in my branch. ```git rebase -i
upstream/master``` opens a nice editor where you can mark some commits to be
squashed(merged) into prior commits, and make 1 big commit (or several) out of
it. In this way, I can tidy up what will be committed to the project master's
history since otherwise my commit messages are like "not working" or "got it
working" or "more fix" or "merged <git-user-id>/gearpump to master".
-6. If there is conflict, resolve the conflict, and then
+3. If there is conflict, resolve the conflict, and then
```bash
git rebase --continue
```
After the code is successfully rebased, a window will pop up to edit the
commit log, edit it then save and exit.
-7. After rebase, now you have a clean log history. push to your remote
working branch
+4. After rebase, now you have a clean log history. push to your remote
working branch
```
git push origin branch_issueId
```
- If commits have already been pushed to <git-user-id>/gearpump fork on
github, you will have to "git push --force" to overwrite them with squashed
commits.
+ If commits have already been pushed to your
<git-user-id>/incubator-gearpump fork on github, you will have to "git push
--force" to overwrite them with squashed commits.
--- End diff --
`GitHub` instead of `github`
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
