git-buildpackage icon indicating copy to clipboard operation
git-buildpackage copied to clipboard

Published 20 hours ago • verified publisher icon agx

[RFC] gbp-pull: similar force update strategy for all branches

Open marquiz opened this issue 7 years ago • 2 comments

Follow-up from #39. This patch is probably not ready for merging, but, a base for discussion.

Discussion from #39

I still think there is something broken in the gbp-pull logic when --force is used. The currently checked-out branch is merged but the others are just reset which I see kind of bad because the end result depends on the currently checked out branch. For example, if I happened to be on pq branch the debian branch would be simply reseted to whatever the upstream has. But, if I happened to be on the debian branch it would be merged, instead. Any thoughts?

marquiz avatar Jan 29 '18 10:01 marquiz

This would also fix http://bugs.debian.org/875852

agx avatar Feb 03 '18 20:02 agx

ping @agx, any thoughts on this?

marquiz avatar Sep 14 '18 06:09 marquiz