Skip to content

sr3_pull overwrites any local changes on the nodes #10

@reidsunderland

Description

@reidsunderland

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?

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions