linux-kernel - merge conflicts with tip/master

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1214327937.27577.6.camel@promb-2n-dhcp368.eng.vmware.com>
Date:	Tue, 24 Jun 2008 10:18:57 -0700
From:	Alok Kataria <akataria@...are.com>
To:	Ingo Molnar <mingo@...e.hu>
Cc:	LKML <linux-kernel@...r.kernel.org>
Subject: merge conflicts with tip/master

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