Author Topic: XTide  (Read 855 times)

Dave Yeo

  • Hero Member
  • *****
  • Posts: 5670
  • Karma: +145/-1
    • View Profile
Re: XTide
« Reply #15 on: January 22, 2026, 04:48:42 pm »
I seems to have messed up the branch.
Code: [Select]
H:\tmp\LIB-TIME-tzdb>git branch
* main
  master

H:\tmp\LIB-TIME-tzdb>git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.

H:\tmp\LIB-TIME-tzdb>git checkout main
Switched to branch 'main'
Your branch and 'origin/main' have diverged,
and have 5 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

H:\tmp\LIB-TIME-tzdb>git pull
fatal: refusing to merge unrelated histories

Have to delete the branch and start over I guess.

Dave Yeo

  • Hero Member
  • *****
  • Posts: 5670
  • Karma: +145/-1
    • View Profile
Re: XTide
« Reply #16 on: January 22, 2026, 10:01:40 pm »
I've sorta fixed the repository. History is a bit broken with 3 initial commits, one mine and 2 yours but I doubt it matters.