lkml.org 
[lkml]   [2008]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: merge conflicts with tip/master
* Alok Kataria <akataria@vmware.com> [2008-06-24 10:18]:
>
> 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.

You might also try guilt [1], which is a mix between st-git and quilt.
Just a hint, it does not solve your problem. :)


Bernhard

[1] http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/

--
Bernhard Walle, SUSE LINUX Products GmbH, Architecture Development


\
 
 \ /
  Last update: 2008-06-24 20:41    [W:0.047 / U:0.612 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site