| |
|
 |
|
 |
|
|
|
| |
|
|
xen-devel
[Xen-devel] Re: merge conflict in pv_ops dom0 git tree in include/linux/
On Fri, Oct 16, 2009 at 07:19:46AM -0700, Jeremy Fitzhardinge wrote:
> >
> > Any ideas?
> >
>
> I did some rewriting of the xen/master branch and it may have confused
> your end. If you don't have any local changes, you can just do "git
> reset --hard origin/xen/master" to reset your local xen/master branch to
> be the same as mine.
>
Thanks. That worked.
-- Pasi
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
|
|
| |
|
Home