GitFlow.VS icon indicating copy to clipboard operation
GitFlow.VS copied to clipboard

Auto update develop branch

Open mrobinson-compass opened this issue 6 years ago • 3 comments

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

mrobinson-compass avatar Mar 06 '18 00:03 mrobinson-compass

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

jakobehn avatar Mar 06 '18 00:03 jakobehn

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

mrobinson-compass avatar Mar 06 '18 02:03 mrobinson-compass

@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.`

ibcooley avatar Apr 10 '18 17:04 ibcooley