Comments (10)
i have the branch "main" in git and the .env "branch_name=mainbranch_name=main". I also tried "head", but that did not help
When your branch name is "main" you should put it into the .env
:
branch_name=main
from klipper-backup.
Yes, i had "main" first. As this did not work, i tried "head". Neither worked. [Maybe PC needs a restartz?]
The second one like "unknown Refspec"
And the third one "rebase" --> can i do something about this ?
from klipper-backup.
Well, you wrote branch_name=mainbranch_name=main
and not branch_name=main
.
But if you're 100% sure it's correct inside .env
: You screwed something up. At this point i am talking about release 1.1.0:
You could try to move into your backup folder which should be cd ~/config_backup
and do a git rebase --continue
or git rebase --abort
there and run the script.sh
again.
from klipper-backup.
Ok. Next Learning - reboot helps
next learning...i must rebase in the config_backup folder and not in the klipper-backup one...
from klipper-backup.
So did you solve the issue?
from klipper-backup.
Yes, this part, but now i have something like this.
I am not sure yet, how i can clean up all this (mess).
Would like to del my github backup and start the first backup from scratch...
" 18-01-24), es sollte vielleicht nach home/tom/printer_data/config/printer_data/config/crowsnest.conf verschoben werden.
KONFLIKT (Speicherort): klipper/printer_data/config/.moonraker.conf.bkp hinzugefügt in HEAD innerhalb eines Verzeichnisses, das umbenannt wurde in 74fef7e (New backup from 18-01-24), es sollte vielleicht nach home/tom/printer_data/config/printer_data/config/.moonraker.conf.bkp verschoben werden.
KONFLIKT (Speicherort): klipper/printer_data/comms/klippy.serial hinzugefügt in HEAD innerhalb eines Verzeichnisses, das umbenannt wurde in 74fef7e (New backup from 1 8-01-24), es sollte vielleicht nach home/tom/printer_data/config/printer_data/comms/klippy.serial verschoben werden.
KONFLIKT (Speicherort): klipper/printer_data/backup/20231204T185009Z/config/moonraker.conf hinzugefügt in HEAD innerhalb eines Verzeichnisses, das umbenannt wurde in 74fef7e (New backup from 18-01-24), es sollte vielleicht nach home/tom/printer_data/config/printer_data/backup/20231204T185009Z/config/moonraker.conf verschoben werde n.
KONFLIKT (Speicherort): klipper/printer_data/.moonraker.uuid hinzugefügt in HEAD innerhalb eines Verzeichnisses, das umbenannt wurde in 74fef7e (New backup from 18-01 -24), es sollte vielleicht nach home/tom/printer_data/config/printer_data/.moonraker.uuid verschoben werden.
error: Konnte 74fef7e... (New backup from 18-01-24) nicht anwenden
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Konnte 74fef7e... (New backup from 18-01-24) nicht anwenden
To https://github.com/Experiment4/Evolux.git
! [rejected] main -> main (non-fast-forward)
error: Fehler beim Versenden einiger Referenzen nach 'https://github.com/Experiment4/Evolux.git'
Hinweis: Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten
Hinweis: Branches hinter seinem externen Gegenstück zurückgefallen ist. Checken Sie
Hinweis: diesen Branch aus und führen Sie die externen Änderungen zusammen
Hinweis: (z. B. 'git pull ...') bevor Sie erneut "push" ausführen.
Hinweis: Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'
Hinweis: für weitere Details.
from klipper-backup.
Just do a cleanup:
cd ~
rm -r ./klipper-backup
rm -r ./config_backup
git clone https://github.com/Staubgeborener/klipper-backup.git && chmod +x ./klipper-backup/script.sh && cp ./klipper-backup/.env.example ./klipper-backup/.env
# edit .env
maybe you get this rebase error again, but just solve it like the last time and run script.sh
.
Btw: You didn't create a repository under https://github.com/Experiment4/Evolux, the page just returns 404.
And please use `` for code or > for block quote, it's quite hard to read otherwise.
from klipper-backup.
So, now it is solved. Important trick for me..it does not depend on a reboot. If you f** up something in .env, you must delete the .git directory and start over again.
from klipper-backup.
Thanks for supporting here !
from klipper-backup.
Alright, glad you solve it.
from klipper-backup.
Related Issues (20)
- [Bug]: Script asks for password HOT 9
- [Bug]: HOT 28
- [Bug]: HOT 17
- Custom README.md HOT 4
- Skript asks for password after update to newest version HOT 7
- Backing up symbolic links HOT 4
- Error when Uploading - fatal: not a git repository HOT 15
- cp: unrecognized option '--parents' HOT 5
- Primary setup command doesn't work HOT 12
- (RESOLVED) fatal: loose object, and related errors HOT 16
- Simple way to change the service-name, listed in Mainsail? HOT 9
- Lost Network Access HOT 2
- Add ability to backup composed configuration that are using [included ...cfg] files. HOT 7
- [Bug]: HOT 22
- Created two users? HOT 3
- Security issue - telegram bot conf HOT 4
- Add Restore Script HOT 2
- Does not back up symbolic links like those used by ERCF HOT 3
- Backup omits directories starting with a `.` HOT 14
- Split .env file into seperate files for future restore use HOT 1
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 klipper-backup.