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

Merge 'master' into 'dev' #96

Merged
merged 2 commits into from
Apr 25, 2018
Merged

Merge 'master' into 'dev' #96

merged 2 commits into from
Apr 25, 2018

Conversation

cdce8p
Copy link
Contributor

@cdce8p cdce8p commented Apr 24, 2018

Resolve merge conflicts, that would happen otherwise if dev was to be merged into master for the next release. The alternative would we a quite complicated rebase.

To avoid such problems in the future, it's best after dev is merged into master and master is up to date (released), to merge master back into dev before doing anything else.

ikalchev and others added 2 commits April 6, 2018 12:43
@ikalchev
Merge char improvements, doc changes, version 1.1.9 (#79)
084bb73 
* Remove breaking change description from README.

* Characteristic improvements (#73)

* Merged set_value and get_hap_value

* Small improvements
* Added helper method '_validate_value'
* Added helper method '_get_default_value'
* Raise ValueError if properties are invalid
* Added __slots__

* Additional changes

* New method: update_value (use for value updates from HAP-python)
* Rename: to_HAP to to_dict
* New method: from_dict (use during loading of chars)

* Addressed comments

* Fixed errors, small mistakes

* Added debug statements

* Changed '_LOGGER' to 'logger'

* Changed raise error to return None

* Raising ValueErrors with custom msg

* Bugfix, added additional logger.error statements

* Rearanged functions

* Added error_msg parameter

* Added tests

* Added '/htmlcov' to .gitignore

* Bump version number to 1.1.9
@cdce8p
Merge branch 'master' into dev
a838d96 
* Solve all merge conflicts
@cdce8p cdce8p mentioned this pull request Apr 24, 2018
Merged
@ikalchev
Copy link
Owner

Can you elaborate?

@ikalchev ikalchev merged commit 149bfdb into ikalchev:dev Apr 25, 2018
@cdce8p cdce8p deleted the master-merge branch April 25, 2018 06:34
@cdce8p
Copy link
Contributor Author

cdce8p commented Apr 25, 2018

While working on the changelog I noticed that the dev branch was blocked for merging into the master branch, because of conflicts. The likely cause of it was that the last commit to master was a squash merge from dev. This leads to problems since git doesn't recognize that the commit has already been merged. Therefore squash merging should only be used to merge PRs.

Regarding the workflow for merging to master. I haven't figured that out completely yet, but this is what I do know should work quite well:

  1. Update version to new release in dev though PR or commit
  2. Locally
    1. Checkout a new feature branch from master (be sure to fetch the current master branch first)
    2. Merge dev into feature branch
  3. Create a PR from the feature branch
  4. normal merge the PR into the master branch. This will create a merge commit and GitHub will notice that now master is ahead of dev
  5. Therefore merge master into dev and push the commit to Github.
  6. Both branches should now be equal. And any new PR can be merged into dev.
  7. Create a new release on GitHub
  8. Lastly push the new version to pypi

Let me know if I can help with anything.

@ikalchev
Copy link
Owner

Thanks for the thorough explanation, really helpful!

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
@cdce8p @ikalchev