diff --git a/assets/dictionary.txt b/assets/dictionary.txt index 8a54ed96a3..e021ad2788 100644 --- a/assets/dictionary.txt +++ b/assets/dictionary.txt @@ -20,3 +20,7 @@ featureFlag displayNames componentDidMount .png +rebasing +unstaged +rebases +sha diff --git a/docs/issues.md b/docs/issues.md index 1838a63b4a..5ba66acda9 100644 --- a/docs/issues.md +++ b/docs/issues.md @@ -8,7 +8,7 @@ * [Triaging](#triaging) * [Issue Organization](#issue-organization) * [Community Friendly](#community-friendly) -* [Rebasing](#rebasing) +* [Git Workflow](#git-workflow) ### Issue Titles @@ -195,9 +195,9 @@ It's common to create a PR and a couple days later see that it has a conflict. There are two approaches: the github ui, update your branch locally. If the problem is simple, you can use the ui. Generally, you'll want to update your branch locally. -The first thing to do is to clean up your unstaged work by either commiting it, stashing it, or checking it out. -Once your branch is clean, you should update your local master branch. It's a good rule of thumb, that master should -point to [origin](https://github.com/devtools-html/debugger.html), but often the `master` branch points to +The first thing to do is to clean up your unstaged work by either committing it, stashing it, or checking it out. +Once your branch is clean, you should update your local master branch. It's a good rule of thumb that master should +point to [origin][orig], but often the `master` branch points to your fork. If this is the case, then you'll need to add `origin` as a [remote][rdoc]. Once master is uptodate, you can go back to your feature branch and update it. @@ -213,6 +213,7 @@ work on top of master. There are three steps: ![rebase-screen] +[orig]: https://github.com/devtools-html/debugger.html [edx]: https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request [servo]: https://github.com/servo/servo/wiki/Beginner%27s-guide-to-rebasing-and-squashing [rebase-docs]: https://help.github.com/articles/about-git-rebase/