<div dir="ltr"><div>Hi Dirk, <br>I did this, was able to get a bit further, now I have a lot of merge conflicts, should I just delete those conflicting files? :</div><div><br></div>sysop@debian-2gb-nbg1-1:~/spider$ git checkout master<br>Switched to branch 'master'<br>Your branch and 'origin/master' have diverged,<br>and have 359 and 83 different commits each, respectively.<br> (use "git pull" to merge the remote branch into yours)<div><br>sysop@debian-2gb-nbg1-1:~/spider$ git branch -D mojo<br>Deleted branch mojo (was d4ba5e726).</div><div><br></div><div>sysop@debian-2gb-nbg1-1:~/spider$ git reset --hard<br>HEAD is now at d4ba5e726 move isregistered to DXChannel.pm<br><br></div><div>sysop@debian-2gb-nbg1-1:~/spider$ git pull<br>Auto-merging perl/watchdbg<br>Auto-merging perl/<a href="http://issue.pl">issue.pl</a><br>Auto-merging perl/grepdbg<br>CONFLICT (content): Merge conflict in perl/grepdbg<br>Auto-merging perl/<a href="http://create_prefix.pl">create_prefix.pl</a><br>Auto-merging perl/<a href="http://console.pl">console.pl</a><br>CONFLICT (content): Merge conflict in perl/<a href="http://console.pl">console.pl</a><br>Auto-merging perl/<a href="http://cluster.pl">cluster.pl</a><br>CONFLICT (content): Merge conflict in perl/<a href="http://cluster.pl">cluster.pl</a><br>Auto-merging perl/Version.pm<br>CONFLICT (content): Merge conflict in perl/Version.pm<br>Auto-merging perl/Spot.pm<br>CONFLICT (content): Merge conflict in perl/Spot.pm<br>Auto-merging perl/QSL.pm<br>CONFLICT (content): Merge conflict in perl/QSL.pm<br>Auto-merging perl/Messages<br>CONFLICT (content): Merge conflict in perl/Messages<br>Auto-merging perl/Filter.pm<br>CONFLICT (content): Merge conflict in perl/Filter.pm<br>Auto-merging perl/DXVars.pm.issue<br>Auto-merging perl/DXUtil.pm<br>Auto-merging perl/DXUser.pm<br>CONFLICT (content): Merge conflict in perl/DXUser.pm<br>Auto-merging perl/DXSql/SQLite.pm<br>Auto-merging perl/DXProtout.pm<br>CONFLICT (content): Merge conflict in perl/DXProtout.pm<br>Auto-merging perl/DXProtHandle.pm<br>CONFLICT (content): Merge conflict in perl/DXProtHandle.pm<br>Auto-merging perl/DXLog.pm<br>CONFLICT (content): Merge conflict in perl/DXLog.pm<br>Auto-merging perl/DXCron.pm<br>CONFLICT (content): Merge conflict in perl/DXCron.pm<br>Auto-merging perl/DXCommandmode.pm<br>CONFLICT (content): Merge conflict in perl/DXCommandmode.pm<br>Auto-merging perl/DXChannel.pm<br>CONFLICT (content): Merge conflict in perl/DXChannel.pm<br>Auto-merging perl/AsyncMsg.pm<br>CONFLICT (content): Merge conflict in perl/AsyncMsg.pm<br>Auto-merging data/wpxloc.raw<br>CONFLICT (content): Merge conflict in data/wpxloc.raw<br>Auto-merging data/<a href="http://prefix_data.pl">prefix_data.pl</a><br>CONFLICT (content): Merge conflict in data/<a href="http://prefix_data.pl">prefix_data.pl</a><br>Auto-merging data/cty.dat<br>CONFLICT (content): Merge conflict in data/cty.dat<br>Auto-merging cmd/show/<a href="http://version.pl">version.pl</a><br>CONFLICT (content): Merge conflict in cmd/show/<a href="http://version.pl">version.pl</a><br>Auto-merging cmd/show/<a href="http://registered.pl">registered.pl</a><br>CONFLICT (content): Merge conflict in cmd/show/<a href="http://registered.pl">registered.pl</a><br>Auto-merging cmd/show/<a href="http://log.pl">log.pl</a><br>CONFLICT (content): Merge conflict in cmd/show/<a href="http://log.pl">log.pl</a><br>Auto-merging cmd/show/<a href="http://dx.pl">dx.pl</a><br>CONFLICT (content): Merge conflict in cmd/show/<a href="http://dx.pl">dx.pl</a><br>Auto-merging cmd/show/<a href="http://425.pl">425.pl</a><br>Auto-merging cmd/load/<a href="http://dxqsl.pl">dxqsl.pl</a><br>CONFLICT (add/add): Merge conflict in cmd/load/<a href="http://dxqsl.pl">dxqsl.pl</a><br>Auto-merging cmd/Commands_en.hlp<br>Auto-merging cmd/Aliases<br>CONFLICT (content): Merge conflict in cmd/Aliases<br>Auto-merging Changes<br>CONFLICT (content): Merge conflict in Changes<br>Automatic merge failed; fix conflicts and then commit the result.<br>sysop@debian-2gb-nbg1-1:~/spider$ git checkout --track -b mojo origin/mojo<br>Changes: needs merge<br>cmd/Aliases: needs merge<br>cmd/load/<a href="http://dxqsl.pl">dxqsl.pl</a>: needs merge<br>cmd/show/<a href="http://dx.pl">dx.pl</a>: needs merge<br>cmd/show/<a href="http://log.pl">log.pl</a>: needs merge<br>cmd/show/<a href="http://registered.pl">registered.pl</a>: needs merge<br>cmd/show/<a href="http://version.pl">version.pl</a>: needs merge<br>data/cty.dat: needs merge<br>data/<a href="http://prefix_data.pl">prefix_data.pl</a>: needs merge<br>data/wpxloc.raw: needs merge<br>perl/AsyncMsg.pm: needs merge<br>perl/DXChannel.pm: needs merge<br>perl/DXCommandmode.pm: needs merge<br>perl/DXCron.pm: needs merge<br>perl/DXLog.pm: needs merge<br>perl/DXProtHandle.pm: needs merge<br>perl/DXProtout.pm: needs merge<br>perl/DXUser.pm: needs merge<br>perl/Filter.pm: needs merge<br>perl/Messages: needs merge<br>perl/QSL.pm: needs merge<br>perl/Spot.pm: needs merge<br>perl/Version.pm: needs merge<br>perl/<a href="http://cluster.pl">cluster.pl</a>: needs merge<br>perl/<a href="http://console.pl">console.pl</a>: needs merge<br>perl/grepdbg: needs merge<br>error: you need to resolve your current index first<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Op ma 13 dec. 2021 om 17:33 schreef Dirk Koopman via Dxspider-support <<a href="mailto:dxspider-support@tobit.co.uk">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>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">
<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" target="_blank">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">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">Dxspider-support@tobit.co.uk</a>
<a href="https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support" target="_blank">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">Dxspider-support@tobit.co.uk</a><br>
<a href="https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support" rel="noreferrer" target="_blank">https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support</a><br>
</blockquote>
</div>
<br>
<fieldset></fieldset>
<pre>_______________________________________________
Dxspider-support mailing list
<a href="mailto:Dxspider-support@tobit.co.uk" target="_blank">Dxspider-support@tobit.co.uk</a>
<a href="https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support" target="_blank">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">Dxspider-support@tobit.co.uk</a><br>
<a href="https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support" rel="noreferrer" target="_blank">https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support</a><br>
</blockquote></div>