merge conflicts with tip/master
From: Alok Kataria
Date: Tue Jun 24 2008 - 13:20:21 EST
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/