[RFC] gbp-pull: similar force update strategy for all branches#53
Open
marquiz wants to merge 1 commit intoagx:masterfrom
Open
[RFC] gbp-pull: similar force update strategy for all branches#53marquiz wants to merge 1 commit intoagx:masterfrom
marquiz wants to merge 1 commit intoagx:masterfrom
Conversation
Owner
|
This would also fix http://bugs.debian.org/875852 |
marquiz
force-pushed
the
feature/gbp-pull
branch
from
b50a0a5 to
e6b33cc
Compare
marquiz
force-pushed
the
feature/gbp-pull
branch
from
e6b33cc to
d383c44
Compare
Contributor
Author
|
ping @agx, any thoughts on this? |
marquiz
force-pushed
the
feature/gbp-pull
branch
2 times, most recently
from
18e4242 to
9d1bc83
Compare
When using --force, treat non-checked-out branches similarly to the current branch. That is, do git merge, instead of just setting the ref. Also, renames fast_forward_branch() to update_branch() to better match the functionality. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
marquiz
force-pushed
the
feature/gbp-pull
branch
from
9d1bc83 to
d5abdd2
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up from #39. This patch is probably not ready for merging, but, a base for discussion.
Discussion from #39