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

Auto update develop branch #70

Open
mrobinson-compass opened this issue Mar 6, 2018 · 3 comments
Open

Auto update develop branch #70

mrobinson-compass opened this issue Mar 6, 2018 · 3 comments

Comments

@mrobinson-compass
Copy link

When creating new feature it would be great if GitFlow would auto update the master branch if it is out of date.

@jakobehn
Copy link
Owner

jakobehn commented Mar 6, 2018

Thanks for the suggestion. You are mention both auto updating the develop branch and the master branch Which one do you mean? :-)

@mrobinson-compass
Copy link
Author

Develop would be the more useful one as it is used more regularly, but I both would be a good improvement.

@ibcooley
Copy link

@jakobehn I believe he means if finishing a feature, and the (local) develop branch is behind, then have an option to pull the develop branch before merging.

For example, when finishing a feature, we can run into the following error:
`
Error: failed to push some refs to
Error: hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Error encountered while pushing to the remote repository: rejected Updates were rejected because the remote contains work that you do not have locally. This is usually caused by another repository pushing to the same ref. You may want to first integrate the remote changes before pushing again.`

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

No branches or pull requests

3 participants