search

WahlNetwork / vester

Easily validate and remediate your vSphere configuration
https://wahlnetwork.com
Apache License 2.0
146 stars 45 forks source link

(Don't) Publish Vester 1.1.0 #152

Closed brianbunke closed 7 years ago

brianbunke commented 7 years ago

Created a merge conflict I didn't know how to resolve by myself with a protected branch involved; refer to #156.

Resolves #150. #151 should merge in before this PR.

Added release notes! (Both in Vester.psd1, as well as a brand spanking new CHANGELOG.md file)

Rolled the version to 1.1.0 based on SemVer and the amount of crap we've added in the ridiculous expanse of time since we last incremented the version.

(Shameless preemptive @chriswahl)

brianbunke commented 7 years ago

Stupid merge conflict because I still suck at branching.

Two problems:

  1. GitHub doesn't diff .psd1 files natively, so resolving the merge conflict in the web editor is ???
  2. master is a protected branch, so I can't resolve this from the command line the same way I would resolve anyone else's PR...Chris needs to approve all changes I propose

I'm going to recreate this problem in one of my private repos this week and figure out if I can take option 1 without breaking the .psd1, or if I'll need to get Chris involved.

chriswahl commented 7 years ago

@brianbunke I'd just pull the branch down locally, solve the merge issue, and then commit back into the branch. That'll solve the merge conflict. I've never tried solving a conflict via the web.