xserver git version?

[Pekka Paalanen]

On Tue, 15 Apr 2014 21:45:53 -0700
Bill Spitzak <spitzak at gmail.com> wrote:

> It looks like the xwayland branch of xserver has disappeared:
> 
> $ git pull
> Your configuration specifies to merge with the ref 'xwayland'
> from the remote, but no such ref was fetched.
> 
> I tried "git pull origin master" but it produced lots of conflicts, it 
> looks like there are many changes for wayland that are not in master.
> 
> Any help?

Just do not use git-pull to begin with. It tries to merge what you
fetch from the remote into whatever you happen to have in your local
branch. You do not want to merge anything, you just want what is the
latest of some remote branch as is.

Simply use the master branch of xserver.


Thanks,
pq