Repository: spark-website Updated Branches: refs/heads/asf-site f57f0702b -> efcfd7fc8
Fixes git command and description for resolving conflicts Project: http://git-wip-us.apache.org/repos/asf/spark-website/repo Commit: http://git-wip-us.apache.org/repos/asf/spark-website/commit/efcfd7fc Tree: http://git-wip-us.apache.org/repos/asf/spark-website/tree/efcfd7fc Diff: http://git-wip-us.apache.org/repos/asf/spark-website/diff/efcfd7fc Branch: refs/heads/asf-site Commit: efcfd7fc892aadc9de80b93fc52899db95393eea Parents: f57f070 Author: hyukjinkwon <[email protected]> Authored: Tue Jul 25 14:42:01 2017 +0900 Committer: hyukjinkwon <[email protected]> Committed: Tue Jul 25 14:42:01 2017 +0900 ---------------------------------------------------------------------- contributing.md | 7 ++++--- site/contributing.html | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark-website/blob/efcfd7fc/contributing.md ---------------------------------------------------------------------- diff --git a/contributing.md b/contributing.md index 99a7edc..b330962 100644 --- a/contributing.md +++ b/contributing.md @@ -311,9 +311,10 @@ looked at this thoroughly and take as much ownership as if I wrote the patch mys comment LGTM you will be expected to help with bugs or follow-up issues on the patch. Consistent, judicious use of LGTMs is a great way to gain credibility as a reviewer with the broader community. - Sometimes, other changes will be merged which conflict with your pull request's changes. The -PR can't be merged until the conflict is resolved. This can be resolved with `git fetch origin` -followed by `git merge origin/master` and resolving the conflicts by hand, then pushing the result -to your branch. +PR can't be merged until the conflict is resolved. This can be resolved by, for example, adding a remote +to keep up with upstream changes by `git remote add upstream https://github.com/apache/spark.git`, +running `git fetch upstream` followed by `git rebase upstream/master` and resolving the conflicts by hand, +then pushing the result to your branch. - Try to be responsive to the discussion rather than let days pass between replies <h3>Closing Your Pull Request / JIRA</h3> http://git-wip-us.apache.org/repos/asf/spark-website/blob/efcfd7fc/site/contributing.html ---------------------------------------------------------------------- diff --git a/site/contributing.html b/site/contributing.html index 393ed55..82b4431 100644 --- a/site/contributing.html +++ b/site/contributing.html @@ -546,9 +546,10 @@ looked at this thoroughly and take as much ownership as if I wrote the patch mys comment LGTM you will be expected to help with bugs or follow-up issues on the patch. Consistent, judicious use of LGTMs is a great way to gain credibility as a reviewer with the broader community.</li> <li>Sometimes, other changes will be merged which conflict with your pull request’s changes. The -PR can’t be merged until the conflict is resolved. This can be resolved with <code>git fetch origin</code> -followed by <code>git merge origin/master</code> and resolving the conflicts by hand, then pushing the result -to your branch.</li> +PR can’t be merged until the conflict is resolved. This can be resolved by, for example, adding a remote +to keep up with upstream changes by <code>git remote add upstream https://github.com/apache/spark.git</code>, +running <code>git fetch upstream</code> followed by <code>git rebase upstream/master</code> and resolving the conflicts by hand, +then pushing the result to your branch.</li> <li>Try to be responsive to the discussion rather than let days pass between replies</li> </ul> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
