johnbc/my-hangouts-extension — comment on commit eb1cedbabd63af29bbc92d549b2b57776d8910a6
File:  line 0
By mohamedmansour:

You fetch and rebase when you pull. or just git pull upstream master --rebase