Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add update cache on install proxmoxve #125

Merged
merged 1 commit into from
Oct 19, 2021

Conversation

slobberbone
Copy link
Contributor

add update_cache: yes and cache_valid_time: 3600 on "Install Proxmox VE and related packages"

@lae
Copy link
Owner

lae commented Mar 11, 2021

Looks like a bunch of extra commits are included here that conflict with already merged changes.

Can you try rebasing your branch against develop? Locally, I believe you should run the following.

# adds a new location that you can pull changes from, but doesn't automatically pull them
git remote add upstream https://github.com/lae/ansible-role-proxmox.git
# fetches changes from upstream, doesn't automatically add them to your local branches/changes
git fetch upstream
 # starts an interactive rebase session for your current local branch
git rebase -i upstream/develop
# remove the unnecessary commits by changing "pick" to "drop"
# save, and git should attempt to apply the relevant commit
# then overwrite the branch changes for this PR
git push --force

edit: fixed remote to be https

add  update_cache: yes and cache_valid_time: 3600 on "Install Proxmox VE and related packages"
@lae lae merged commit d173143 into lae:develop Oct 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants