search

Appliscale / perun

A command-line validation tool for AWS Cloud Formation that allows to conquer the cloud faster!
https://perun-for-aws.appliscale.io
Apache License 2.0
92 stars 8 forks source link

Removing .preprocessed.yml #83 #106

Closed piwowarc closed 6 years ago

piwowarc commented 6 years ago

I removed code which allowed to generate .preprocessed.yml file.

jlampar commented 6 years ago

I see that @SylwiaGargula commits are re-created in this PR. Shouldn't you:

git stash
git checkout release_2_0
git pull
git checkout issue_83
git merge master

Is it correct?

afronski commented 6 years ago

Yup, @jlampar is correct. Please rebase your branch on top of _release_20 first.

jlampar commented 6 years ago

The last line should be:

git merge release_2_0
afronski commented 6 years ago

Now it looks much better @piwowarc - I've one more request - can we squash and rewrite history for that branch (or just clean it, in another way).