procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Rebase instead of merge

Browse source 
It's better to rebase a pull request instead of merging the latest commits

Signed-off-by: Christoph Auer <auer.chrisi@gmx.net>
This commit is contained in:
auchri 2016-02-26 22:25:56 +01:00 committed by Christoph Auer
parent 77481b7339
commit 9eee689a76
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CONTRIBUTING.md
View file

@ -89,9 +89,13 @@ Check the log to be sure that you actually want the changes, before merging:
git log upstream/master
Then merge the changes that you fetched:
Then rebase your changes on the latest commits in the `master` branch:
git merge upstream/master
git rebase upstream/master
After that, you have to force push your commits:
git push --force
For more info, see [GitHub Help][help_fork_repo].