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

Removing .preprocessed.yml #83 #106

Merged
merged 3 commits into from
Apr 23, 2018
Merged

Removing .preprocessed.yml #83 #106

merged 3 commits into from
Apr 23, 2018

Conversation

piwowarc
Copy link
Contributor

@piwowarc piwowarc commented Apr 5, 2018

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

@piwowarc piwowarc requested review from jlampar and pfigwer April 5, 2018 09:56
Copy link
Contributor

@afronski afronski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, but couple of requests:

  • We need to update .gitignore files too.
  • Remove any notion of that feature from the documentation.
  • This feature should land in 2.0 so destination branch should be release_2_0, not master.

@afronski afronski added this to the Cumulus - 2.0 milestone Apr 5, 2018
@piwowarc piwowarc changed the base branch from master to release_2_0 April 5, 2018 10:14
@jlampar
Copy link
Contributor

jlampar commented Apr 5, 2018

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
Copy link
Contributor

afronski commented Apr 5, 2018

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

@jlampar
Copy link
Contributor

jlampar commented Apr 5, 2018

The last line should be:

git merge release_2_0

@afronski
Copy link
Contributor

afronski commented Apr 5, 2018

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).

@afronski afronski merged commit 8e6a6e0 into release_2_0 Apr 23, 2018
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.

4 participants