Skip to content

Commit

Permalink
fix typo and reformulate small part
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristophTobler authored and LorenzMeier committed Jan 15, 2017
1 parent 62367d8 commit b7ec3ef
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ There you should see the message that a new branch has been pushed to your forke
## Common pitfalls

### Force push to forked repository
After having done the first PR, people from the PX4 community will review your changes. In most cases this means that you have to fix your local branch according to the review. Afther the changes have been done locally, the feature branch needs to be rebased again with the most recent upstream/master. However, after the rebase, it is no longer possible to push the feature branch to your local forked repository directly, but instead you need to use a force push:
After having done the first PR, people from the PX4 community will review your changes. In most cases this means that you have to fix your local branch according to the review. After changing the files locally, the feature branch needs to be rebased again with the most recent upstream/master. However, after the rebase, it is no longer possible to push the feature branch to your forked repository directly, but instead you need to use a force push:
```sh
git push --force-with-lease origin <your feature branch name>
```
Expand Down

0 comments on commit b7ec3ef

Please sign in to comment.