modify README.TXT in local while do as remoter repo
Merge branch 'master' of https://github.com/kiic-leung/learn_git

when modify on local and remote,then push will call inflict,
but why i use git pull k-l-github master:master is rejected?
but git pull k-l-github master is accepted?