Jump to content

Klipper backup to Github question


Recommended Posts

After getting my printer calibration checked before printing Galileo 2 parts,and solving some issues with CW2 latch opening itself I wanted to 
get my config files backed up to a safe location on Github.
I used this video  as a guide to do it https://www.youtube.com/watch?v=47qV9BE2n_Y 

Everything works I can upload files to the github and i can delate,update any file i want.
However when I ssh in to pi and run the klipper command,that works fine I notice  error  in the code,below...how to solve this? 

How to change it to pull git config --global pull.ff only?

 

 

hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.

 


 

Edited by SamppaD
Link to comment
Share on other sites

2 hours ago, SamppaD said:

 

 

...

How to change it to pull git config --global pull.ff only?

...


> hint:   git config pull.rebase false  # merge (the default strategy)
 


 

Like the message says, just run the command. 

 

Why do you want FF rather than the default merge (rebase false)?

Edited by scul
Clarity
  • Like 1
Link to comment
Share on other sites

Hi. I was looking for solution and on few sites recommended way was to use git config pull.ff only or git config--global pull.ff. 
When i run the command git config pull.ff  before uploading files to github I need to do it every time. 
I would like it to be as a default just hit update and its done.   Is it ok to use default then?

Link to comment
Share on other sites

No, you shouldn't have to run that command each time you update. That command changes the git config file for either that git repository, or the global config. 

 

I would probably just use the default, and only for your config directory/files... not doing the global option as I'm not sure if that would affect the updates for other components on the system.

Edited by scul
  • Like 1
Link to comment
Share on other sites

Posted (edited)

Okei I will login in to pi Klipper backup directory and run default without global just to be sure that its the right way.

Update I have made changes and set  git config pull.rebase false  as  default. Seems to work fine. Life is a constant learning process 🙂

Thank you for help.  

Edited by SamppaD
  • Like 1
Link to comment
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

×
×
  • Create New...