Comments (8)
I never had that issue on my side. I'm not even sure what that error means.
from box64.
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.
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.
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.
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.
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.
Can I close the ticket now?
from box64.
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)
- Precompiled builds no longer work. HOT 3
- Minecraft Bedrock server (BDS) on crashes randomly
- Error loading needed lib UnityPlayer.so HOT 3
- Wine's Wayland driver does not load HOT 9
- Failed to load il2cppMemory Statistics HOT 1
- Error during linking in build HOT 5
- Team fortress 2 server not launching HOT 3
- Fear & Hunger SIGABRT on M1 Pro HOT 3
- Fallout New Vegas crashes very often HOT 3
- gnutls_pubkey_export_dh_raw not found HOT 3
- avx_intrinsics test not working on 16k pagesize system
- Kingdom Rush Origins is not working with isSimpleWrapper enabled HOT 1
- Steam on raspberry pi 5 HOT 3
- Soma segmentation fault SIGSEGV when attempting to run on M1 pro
- Can't run veamimmureposvc (Misaligned address error)
- Help anyone?! When I install Steam on a clean ubunto jammy install I get this error when I load up steam. HOT 2
- Steam on raspberry pi 4 HOT 2
- "steamwebhelper requires the Sniper steam runtime" when installing Steam HOT 54
- steamwebhelper requires the Sniper steam runtime. Not found at /home/paul/.local/share/Steam/ubuntu12_64/steam-runtime-sniper, there is a problem with your installation, aborting. HOT 5
- steamwebhelper requires the Sniper steam runtime. Not found at /home/paul/.local/share/Steam/ubuntu12_64/steam-runtime-sniper, there is a problem with your installation, aborting. HOT 2
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
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.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from box64.