Giter Club home page Giter Club logo

Comments (8)

ptitSeb avatar ptitSeb commented on August 21, 2024

I never had that issue on my side. I'm not even sure what that error means.

from box64.

theofficialgman avatar theofficialgman commented on August 21, 2024
remote: Counting objects: 100% (52/52), done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 28 (delta 26), reused 18 (delta 16), pack-reused 0
Unpacking objects: 100% (28/28), done.
From https://github.com/ptitSeb/box64
 + 3d656b5...5287e42 main       -> origin/main  (forced update)
fatal: refusing to merge unrelated histories

every time...
pretty sure its what happens if you force push and delete a commit, etc
But I wouldn't think that would even matter since I'm doing a clone --depth=1 and pull --depth=1

The “fatal: refusing to merge unrelated histories” Git error occurs when two unrelated projects are merged (i.e., projects that are not aware of each other’s existence and have mismatching commit histories).

from box64.

theofficialgman avatar theofficialgman commented on August 21, 2024
git status
On branch main
Your branch and 'origin/main' have diverged,
and have 1 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean

all I did was clone --depth=1 the project yesterday
maybe depth 1 has something to do with it? never had any issues with other repos (I'll clone normally and report back after the next push)

from box64.

ptitSeb avatar ptitSeb commented on August 21, 2024

I don't force push anything. I know @rajdakin had forced pushed something on this repo, but it's at least one month ago, so I don't think it's relevent with your recuring problem.

Are you sure it's not a media issue? Are you on a SDCard that is failing maybe?

from box64.

theofficialgman avatar theofficialgman commented on August 21, 2024

it could be a media issue... but I really really doubt it (this is running from an sd card)
I'll clone on my linux pc with an ssd both ways and let you know after you next push

from box64.

theofficialgman avatar theofficialgman commented on August 21, 2024

hmm.. I pulled today without any issues
I'll leave this open for a week or two just to make sure everything stays fine (really not sure what the problem is/was)

from box64.

ptitSeb avatar ptitSeb commented on August 21, 2024

Can I close the ticket now?

from box64.

theofficialgman avatar theofficialgman commented on August 21, 2024

yes this can be closed... it was just me not understanding that you can't pull with git after having clones with --depth=1

from box64.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.