Subj : Can't Update from Git
To   : Tom Moore
From : Digital Man
Date : Sat Jan 04 2025 08:51 pm

 Re: Can't Update from Git
 By: Tom Moore to Digital Man on Sat Jan 04 2025 09:46 pm

>  > I recommend: git config pull.rebase true
>
> Hi,
> Ran the command you suggested and got the following:
> error: cannot pull with rebase: You have unstaged changes.
> error: Please commit or stash them

So add --autostash to your pull command-line, or define/use an "up" alias, as I do:

https://wiki.synchro.net/howto:git#up_alias

It might be important to know what files you have changed, 'git status' will report that. And then if they're unexpectedly changed, you can 'git checkout' the file(s) to overwrite with the version(s) in the repo. But knowing which files and why they were changed can be important.
--
                                           digital man (rob)

Synchronet "Real Fact" #43:
Synchronet added Baja/PCMS support with v2.00a (1994)
Norco, CA WX: 54.6�F, 65.0% humidity, 0 mph NNW wind, 0.00 inches rain/24hrs

You are viewing proxied material from cvs.synchro.net. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.