[07:17] <tjaalton> ok, looks like my mesa git merge is broken beyond recognition.. for some reason
[07:19] <tjaalton> there doesn't seem to be a merge strategy to always use the remote branch
[07:57] <tjaalton> afk->
[18:39] <jcristau> tjaalton: checkout master, pull -s ours upstream-experimental, then merge the packaging branch
[18:39] <jcristau> or something like that