<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<div class="moz-cite-prefix">Try this:<br>
<br>
git checkout master<br>
git branch -D mojo<br>
git pull<br>
git checkout --track -b mojo origin/mojo<br>
git reset --hard<br>
<br>
On 13/12/2021 16:19, Erwin Fiten via Dxspider-support wrote:<br>
</div>
<blockquote type="cite"
cite="mid:CAMZWqJWT9mB1eMW40EAAj=vqfhE385cfyUzZbkLgOLLonzAVSg@mail.gmail.com">
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<div dir="ltr">Hi Dirk, I just managed to change the branch to
mojo already, so this is the result of these commands:
<div><br>
</div>
<div>sysop@debian-2gb-nbg1-1:~/spider$ git checkout mojo<br>
Already on 'mojo'</div>
<div><br>
sysop@debian-2gb-nbg1-1:~/spider$ git reset --hard<br>
HEAD is now at d4ba5e726 move isregistered to DXChannel.pm</div>
<div><br>
sysop@debian-2gb-nbg1-1:~/spider$ git pull<br>
There is no tracking information for the current branch.<br>
Please specify which branch you want to merge with.<br>
See git-pull(1) for details.<br>
<br>
git pull <remote> <branch><br>
<br>
If you wish to set tracking information for this branch you
can do so with:<br>
<br>
git branch --set-upstream-to=origin/<branch> mojo<br>
</div>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">Op ma 13 dec. 2021 om 17:13
schreef Dirk Koopman via Dxspider-support <<a
href="mailto:dxspider-support@tobit.co.uk"
moz-do-not-send="true">dxspider-support@tobit.co.uk</a>>:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div>
<div>The "correct" way to update is to:<br>
<br>
cd /spider<br>
git reset --hard<br>
git pull<br>
<br>
That's it.<br>
<br>
You are correct that you have reset it back to master
branch. But try this:<br>
<br>
git checkout mojo<br>
git reset --hard<br>
git pull<br>
<br>
<br>
On 13/12/2021 15:44, Erwin Fiten via Dxspider-support
wrote:<br>
</div>
<blockquote type="cite">
<div dir="ltr">Hi,
<div><br>
</div>
<div>I was running <span
style="color:rgb(0,0,0);font-family:Arial;white-space:nowrap"> </span><span
style="color:rgb(0,0,0);font-family:Arial;white-space:nowrap">ver. V1.57
build 345</span></div>
<div><span
style="color:rgb(0,0,0);font-family:Arial;white-space:nowrap">Today
my VM rebooted, so i took the chance to update to
the latest version with the commands :</span></div>
<div><span
style="color:rgb(0,0,0);font-family:Arial;white-space:nowrap"><b><br>
</b></span></div>
<div><b>git clone git://<a
href="http://scm.dxcluster.org/scm/spider"
target="_blank" moz-do-not-send="true">scm.dxcluster.org/scm/spider</a>
spider.new<br>
cp -a spider.new/.git /spider<br>
rm -rf spider.new<br>
cd /spider<br>
git reset --hard</b><br>
</div>
<div><b><br>
</b></div>
<div>Somehow this went wrong because when I restarted
the cluster I found it running (with loads of errors)
on version: V1.55 build 229</div>
<div><br>
</div>
<div>When I check the branch, I get this : </div>
<div><br>
</div>
<div><b>sysop@debian:/spider/perl$ git branch<br>
* master<br>
mojo</b><br>
</div>
<div><br>
</div>
<div>So I'm on the 'old' branch again, I think ?</div>
<div>How do I change back to Mojo & update?</div>
<div><br>
</div>
<div><b>sysop@debian:/spider/perl$ git branch mojo<br>
fatal: A branch named 'mojo' already exists.</b><br>
</div>
<div><br>
</div>
<div>This is not an option...<br>
<br>
Erwin, ON8AR</div>
</div>
<br>
<fieldset></fieldset>
<pre>_______________________________________________
Dxspider-support mailing list
<a href="mailto:Dxspider-support@tobit.co.uk" target="_blank" moz-do-not-send="true">Dxspider-support@tobit.co.uk</a>
<a href="https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support" target="_blank" moz-do-not-send="true">https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support</a>
</pre>
</blockquote>
<br>
</div>
_______________________________________________<br>
Dxspider-support mailing list<br>
<a href="mailto:Dxspider-support@tobit.co.uk" target="_blank"
moz-do-not-send="true">Dxspider-support@tobit.co.uk</a><br>
<a
href="https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support"
rel="noreferrer" target="_blank" moz-do-not-send="true">https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support</a><br>
</blockquote>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<pre class="moz-quote-pre" wrap="">_______________________________________________
Dxspider-support mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Dxspider-support@tobit.co.uk">Dxspider-support@tobit.co.uk</a>
<a class="moz-txt-link-freetext" href="https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support">https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support</a>
</pre>
</blockquote>
<br>
</body>
</html>