yvi: Kaylee half-smiling, looking very pretty (Default)
yvi ([personal profile] yvi) wrote in [site community profile] dw_dev_training2012-09-02 07:29 pm
Entry tags:

More git newbie questions

So I managed to submit my first pull request \o/

However, i have the following problem, bets described in console output:

dh-yvi@newhack:~/dw$ git checkout develop
Switched to branch 'develop'
Your branch is ahead of 'dreamwidth/develop' by 68 commits.
dh-yvi@newhack:~/dw$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'dreamwidth/master' by 200 commits.

dh-yvi@newhack:~/dw$ git pull dreamwidth develop:develop
Already up-to-date.
dh-yvi@newhack:~/dw$ git pull dreamwidth master:master
From https://github.com/dreamwidth/dw-free
! [rejected] master -> master (non-fast-forward)
dh-yvi@newhack:~/dw$ git push origin develop
Everything up-to-date
dh-yvi@newhack:~/dw$ git push origin master
Everything up-to-date


What's going on there?