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

support setting enums by numeric values #19

Merged
merged 4 commits into from
Feb 9, 2016
Merged

Conversation

romor
Copy link
Contributor

@romor romor commented Feb 8, 2016

As discussed in issue #13.

This also includes pull request #18, since this is not merged yet.

@kipe
Copy link
Owner

kipe commented Feb 9, 2016

You really should learn to use feature branches ;)

My own workflow is as follows, I've found it quite simple and effective:

git fetch  # Fetches the current states of the branches
git checkout -b feature_XXY upstream/master  # Checks out a new branch, starting from where upstream/master is
*make changes and commit them*
git push origin feature_XXY  # Pushes the commits to a branch in origin (your fork)

This way, the new changes always start from where the upstream (in this case, my repo) is. For this to work, of course you need a remote pointing to "upstream": git remote add upstream git@github.com:kipe/enocean.git

By using this method, if pull request isn't merged, it doesn't affect anything and allows you to work on multiple issues/features at the same time. Also, if for some reason PR #18 isn't merged, it makes it very hard to merge this. If it was referencing the current master, it'd be a lot easier ;)

That being said, I'll try and leave work earlier and get these PRs reviewed and merged. For the future, I'd appreciate using feature branches referring to the current state of upstream though ;)

kipe added a commit that referenced this pull request Feb 9, 2016
support setting enums by numeric values
@kipe kipe merged commit 675d4a4 into kipe:master Feb 9, 2016
@romor
Copy link
Contributor Author

romor commented Feb 9, 2016

thanks for your comments

@romor romor deleted the int_enum branch February 9, 2016 19:53
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.

2 participants