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.

Sign up for GitHub

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

Jump to bottom

Issue 1321 fix #2782

Merged
merged 4 commits into from
Nov 15, 2018
Merged

Issue 1321 fix #2782

merged 4 commits into from
Nov 15, 2018

Conversation

kuceb
Copy link
Contributor

@kuceb kuceb commented Nov 14, 2018 •
edited
Loading

must be merged via command line

fix history for #2685

This is because we cannot use git merge --no-ff, as our history will not be preserved

git checkout develop
git merge issue-1321-fix
git push origin develop

no_squash

@brian-mann brian-mann merged commit 75aee9c into develop Nov 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@kuceb @brian-mann