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

Fix fc get typename #28

Closed
wants to merge 9 commits into from
Closed

Fix fc get typename #28

wants to merge 9 commits into from

Conversation

mkochanowicz
Copy link

No description provided.

theoreticalbts and others added 9 commits March 7, 2017 14:02
@mkochanowicz mkochanowicz changed the base branch from develop to bip-container-typename September 22, 2017 01:05
@mkochanowicz mkochanowicz changed the base branch from bip-container-typename to 25-remove-thread-logging September 22, 2017 01:06
@mkochanowicz mkochanowicz changed the base branch from 25-remove-thread-logging to 22-websocket-api-newlines September 22, 2017 01:07
@mvandeberg
Copy link

Why is this a PR against #22?

@mkochanowicz
Copy link
Author

To be honest - I've just tried to minimize no of other commits. What is the proper way? Choose develop as base?

@mvandeberg
Copy link

The branch should be based on and merged back to master.

The branch 22-websocket-api-newlines has not been merged. And we only want steem to use fc/master commits.

@mvandeberg
Copy link

I'm not entirely sure what you did in your commit history. It is probably easiest just to make a new branch based on master and cherry pick the relevant commit on to that branch.

In the meantime, @theoreticalbts should make a PR for #22.

@mkochanowicz mkochanowicz deleted the fix-fc-get_typename branch September 27, 2017 14:53
@mkochanowicz
Copy link
Author

These changes already commited into master (6 days ago), so I close this PR.

@mvandeberg
Copy link

We don't have the same enforced branch protection on fc, but please do not merge to master without having either @theoreticalbts or myself review it.

@mkochanowicz
Copy link
Author

OK, I'll remember it for the future. Simply I didn't know that.

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.
3 participants
@mkochanowicz @mvandeberg @theoreticalbts