[WIP] Add --rebase and --ensure-sync options to pull-request:merge command#634
Open
phansys wants to merge 8 commits intogushphp:masterfrom
Open
[WIP] Add --rebase and --ensure-sync options to pull-request:merge command#634phansys wants to merge 8 commits intogushphp:masterfrom
--rebase and --ensure-sync options to pull-request:merge command#634phansys wants to merge 8 commits intogushphp:masterfrom
Conversation
Contributor
|
He, welcome to the Gush team 👍 please change the Label if you think it's a bug instead of a refactor. |
Member
Author
|
Thank you @sstok! I'm sorry, I haven't labelling permissions. |
Member
Author
|
@gushphp/contributor, any thoughts on this? Please share your concerns. |
src/Helper/GitHelper.php
Outdated
| $tmpName, | ||
| $commitHash, | ||
| ]; | ||
| $commands = ['git', 'notes', '--ref='.$ref, 'add', '--file', $tmpName, $commitHash]; |
Member
There was a problem hiding this comment.
The '--ref='.$ref can be split to separate arguments, for uniformity
src/Helper/GitHelper.php
Outdated
| $tmpName, | ||
| $commitHash, | ||
| ]; | ||
| $commands = ['git', 'notes', '--ref=', $ref, 'add', '--file', $tmpName, $commitHash]; |
phansys
changed the title
git pull --rebase {base-branch} call at GitHelper::squashCommits()--rebase and --ensure-sync options to pull-request:merge command
phansys
force-pushed
the
ticket_633
branch
2 times, most recently
from
2f9c502 to
6a1d22e
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
3 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.
TODO:
Closes #633.