Subject: merge conflicts with tip/master
From: Alok Kataria <akataria@vmware.com>
Reply-To: akataria@vmware.com
To: Ingo Molnar <mingo@elte.hu>
Cc: LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain
Organization: VMware INC.
Date: Tue, 24 Jun 2008 10:18:57 -0700
Message-Id: <1214327937.27577.6.camel@promb-2n-dhcp368.eng.vmware.com>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 835
Lines: 25

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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/