Is this git handling of a problem on my macports-ports fork&clone OK?

[Joshua Root]

On 2022-2-21 10:01 , Gerben Wierda wrote:
> Stuff like ‘—autostash' and ‘popping the stash’ is gobbledygook to me. 
> git is just something that covers so many complex scenario’s and I am 
> using it so little in those scenarios that most of it is simply out of 
> my understanding.

<https://www.atlassian.com/git/tutorials/saving-changes/git-stash>

I mean simply that when you run:

git rebase upstream/master

as per the WorkingWithGit instructions, add the --autostash option:

git rebase --autostash upstream/master

And your uncommitted changes will be automagically preserved without git 
complaining about them.

- Josh