RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

This commit is contained in:
John Preston 2016-02-27 22:40:03 +03:00
parent a88b676588 06d675d39f
commit d80f44d3fc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CONTRIBUTING.md
View File

@ -73,7 +73,7 @@ For more info, see [GitHub Help][help_change_commit_message].
## Build instructions
See the [readme][README.md#build-instructions] for details on the various build
See the [README.md](README.md#build-instructions) for details on the various build
environments.
## Pull upstream changes into your fork regularly
@ -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].