search

theforeman / foreman_fog_proxmox

Foreman plugin to add Proxmox compute resource based on fog-proxmox gem
GNU General Public License v3.0
102 stars 30 forks source link

fix: Create host fails on 2.5.2 #239

Closed tristanrobert closed 1 year ago

tristanrobert commented 1 year ago

Fixes #207

tristanrobert commented 1 year ago

I'd rebase the commit for a cleaner history. You also have a few changes that you revert. Right now it's hard to review.

I agree with you. But I wonder from which commit I could rebase? Because https://github.com/theforeman/foreman_fog_proxmox/pull/238 have been merged before this PR. If I rebase on this commit 200022a626b02fd4f4b53ac18423f501586af464 or this one 9c072e866f8edcff317be526edc9bbfef5d3b847 I still have conflicts. And I would have to add your suggestion commits too.

image

ekohl commented 1 year ago

What I'd do is actually "start over" with your commit. If you use git reset master you'll keep all your file changes but "delete" the commit. Then use git add -p to only add the changes you want and git commit that. Then force push your branch.

tristanrobert commented 1 year ago

What I'd do is actually "start over" with your commit. If you use git reset master you'll keep all your file changes but "delete" the commit. Then use git add -p to only add the changes you want and git commit that. Then force push your branch.

Thank you for your help. I will try this way with a clean commit.

tristanrobert commented 1 year ago

Replaced by https://github.com/theforeman/foreman_fog_proxmox/pull/240