You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
sr3_pull currently does a git reset --hard HEAD before pulling the config and plugins repos. This was intentional, I wanted to overwrite local changes that had been made and forgotten about, and I wanted to ensure the configs were identical across all cluster nodes and reflected the remote repo.
But when multiple people are working on stuff, sometimes the local changes need to stay around for a while.
Options:
do a git stash --include-untracked before pulling. This would let someone come back and recover their changes. Problem: need a way to get rid of old stashes that aren't needed.
warn the user that the local repos are not clean and abort. Provide a --force or similar option to force overwrite local changes.
other options?
The text was updated successfully, but these errors were encountered:
sr3_pull doesn't delete untracked files, it just resets any modified files. Apparently git clean --force -d (-d for directories) is needed to delete untracked.
sr3_pull
currently does agit reset --hard HEAD
before pulling the config and plugins repos. This was intentional, I wanted to overwrite local changes that had been made and forgotten about, and I wanted to ensure the configs were identical across all cluster nodes and reflected the remote repo.But when multiple people are working on stuff, sometimes the local changes need to stay around for a while.
Options:
git stash --include-untracked
before pulling. This would let someone come back and recover their changes. Problem: need a way to get rid of old stashes that aren't needed.--force
or similar option to force overwrite local changes.The text was updated successfully, but these errors were encountered: