Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add links to explain force pushing for rebase #534

Merged
merged 2 commits into from
Jul 25, 2018
Merged

Add links to explain force pushing for rebase #534

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17334d8
Adding helpful links for rebase
krazyito65 Jul 25, 2018
214df5b
Update CONTRIBUTING.md
Stanzilla Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ If you want to help, here's what you need to do:
> git push --force
```
* Note: Force-pushing is a destructive operation, so make sure you don't lose something in the progress.
* If you want to know more about force-pushing and why we do it, there are a two good posts about it: one by [Atlassian](https://www.atlassian.com/git/tutorials/merging-vs-rebasing#the-golden-rule-of-rebasing) and one on [Reddit](https://www.reddit.com/r/git/comments/6jzogp/why_am_i_force_pushing_after_a_rebase/).
* Your pull request should now have no conflicts and be ready for review and merging.

## Reporting Issues and Requesting Features
Expand Down