Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Commit

Permalink
Update issues.md
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonLaster committed Oct 13, 2017
1 parent e2550b2 commit e5b7068
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
4 changes: 4 additions & 0 deletions assets/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ featureFlag
displayNames
componentDidMount
.png
rebasing
unstaged
rebases
sha
9 changes: 5 additions & 4 deletions docs/issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* [Triaging](#triaging)
* [Issue Organization](#issue-organization)
* [Community Friendly](#community-friendly)
* [Rebasing](#rebasing)
* [Git Workflow](#git-workflow)

### Issue Titles

Expand Down Expand Up @@ -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.
Expand All @@ -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/
Expand Down

0 comments on commit e5b7068

Please sign in to comment.