ome / scc

OME tools for managing the Git(Hub) workflow
https://pypi.org/project/scc/
GNU General Public License v2.0
0 stars 15 forks source link

Always push the branch in the Merge command #205

Closed sbesson closed 9 years ago

sbesson commented 9 years ago

The current design was implemented for repositories with lots of open requests in mind so that the merge branch is always updated. However, for repositories or development branches with few PRs opened, the requirement can mean the merge branch never gets updated to the HEAD of the development branch if all PRs are closed or excluded.

This commit removes this restriction by pushing unconditionally the merge branch when the --push argument is passed.

/cc @joshmoore

joshmoore commented 9 years ago

Change makes sense unless something breaks and we realize we need a --force-push (or similar)

sbesson commented 9 years ago

--force-push is an option but would require to modify semantics across the CI board which looks like unnecessary work. I am more inclined to call this a bug and have the --push option semantically meaning force pushing.

joshmoore commented 9 years ago

Fair enough.