procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1696 from telegramdesktop/auchri-patch-2 

Rebase instead of merge
This commit is contained in:
telegramdesktop 2016-02-27 16:24:47 +03:00
parent 175968c3c0 9eee689a76
commit 20881c5297
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].