merge conflicts with tip/master

[Alok Kataria <akataria@vmware.com>]

Hi Ingo,

While working with tip/master...after following the steps in the readme
@ http://people.redhat.com/mingo/tip.git/readme.txt

I usually do any changes and manage them using "quilt". 
Once the changes are pushed upstream, i do a "quilt pop"
and generally try a "git pull" to check for any new changes, along with
the change that was just pushed. 

This method works fine for me with Linus's tree. 
But with tip/master i usually get "merge conflicts"

Am i doing something wrong over here...am i supposed to not use git pull
for updating the local tip/master copy ? 

Thanks,
Alok