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

Manually merging Levelbuilder changes into staging #27205

Merged
merged 9 commits into from
Feb 22, 2019
Merged

Conversation

uponthesun
Copy link

@uponthesun uponthesun commented Feb 22, 2019

This automatic pull request had merge conflicts: #27200

To fix this, I followed these steps on my local machine:

git fetch
git checkout levelbuilder
git checkout -b lb-to-staging
git merge staging
git push --set-upstream origin lb-to-staging

Which had no merge conflicts.

@uponthesun uponthesun merged commit 0a51a6c into staging Feb 22, 2019
@uponthesun uponthesun deleted the lb-to-staging branch February 22, 2019 22:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants