Skip to content
This repository has been archived by the owner on Nov 28, 2023. It is now read-only.

hf update pushes to master and develop #84

Open
aehlke opened this issue Apr 10, 2015 · 3 comments
Open

hf update pushes to master and develop #84

aehlke opened this issue Apr 10, 2015 · 3 comments
Assignees
Labels
Milestone

Comments

@aehlke
Copy link

aehlke commented Apr 10, 2015

This was extremely surprising behavior for us: https://github.com/datasift/gitflow/blob/master/hubflow-common#L369-L387

The help string for hf update only mentions pulling changes from remote to local, so we did not expect a developer's local master to get pushed to origin. Although it was a mistake that originally led the developer to having changes in their master branch, it still should not have made it back to origin as a result of hf update - in our opinion, changes to master (as well as to develop) should always be an explicit action, not a side effect of something else.

@stuartherbert
Copy link
Collaborator

hf update is meant to bring the local master and develop branches into sync with origin. The original thinking here was that Hubflow exists to implement a star topology on top of git, partly because I'm not confident that it is easy for someone to notice that local and origin are out of sync.

I'll take a look at how easy it would be to avoid pushing back up to origin.

@cantonic
Copy link

cantonic commented Dec 7, 2015

this caused some headaches in our company. Any news on this?

@aehlke
Copy link
Author

aehlke commented Dec 7, 2015

@cantonic We'd like to pick up gitflow again and this is one of the blockers. But one thing that might help you in the meantime would be to enable branch protection on master in GitHub.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

No branches or pull requests

4 participants