[L2Ork-dev] osx version flag
Sam Thursfield
samthursfield at pm.me
Wed Oct 14 13:46:25 EDT 2020
On Wednesday, 14 October 2020 17:33, Jonathan Wilkes <jon.w.wilkes at gmail.com> wrote:
> Albert and/or Sam,
>
> I seem to have a dangling merge request for one of Sam's patches here:
>
> https://git.purrdata.net/jwilkes/purr-data/-/merge_requests/550
>
> Gitlab says it conflicts with the main branch. I get a lot of lines of
> the yml file being diff'd when I look at the merge.
This should be a just a single line. I tried to rebase it but I currently get an error when I pull:
$ git remote update --prune
remote: The project you were looking for could not be found.
fatal: repository 'https://git.purrdata.net/jwilkes/purr-data.git/' not found
I also get a 404 error looking at the merge request. Any idea what's wrong?
Sam
More information about the L2Ork-dev
mailing list