import-all() support git submodule and add drop-all() function#2
Open
allenyllee wants to merge 5 commits into501st-alpha1:masterfrom
Open
import-all() support git submodule and add drop-all() function#2allenyllee wants to merge 5 commits into501st-alpha1:masterfrom
allenyllee wants to merge 5 commits into501st-alpha1:masterfrom
Conversation
…because I've encounter a problem of different short SHA length between machines)
WrichikBasu
reviewed
Oct 31, 2022
| # remove from remote refs/stashes | ||
| git push $remote :refs/stashes/$stashCommit | ||
| # remove from local refs/stashes | ||
| git update-ref -d refs/stashes/$stashCommit |
There was a problem hiding this comment.
This is important; I added this as a comment to the original Stack Overflow answer (and obviously credited you).
|
@501st-alpha1 Any update on when (and if) this PR will be merged? |
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
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.
Hi @501st-alpha1 ,
I come from your stackoverflow anwser, and tries to use your script, it's a great job! But I've encountered some problems, so I try to fix those as below:
As you say in #1 (comment), I try to split it into 5 commits. But it can be difficult to separate it into 5 PRs, because every commit is based on previous modification, and the modification is on the same file. If I make each commit as a PR, which all based on your latest commit, when you merge one of those PRs, then merge the other one, it will be conflicted.
Also, separate it into 5 PRs seems takes more effort than just split and commit it sequentially. So I just split it into atomic commit, and still single PR. Tall me if you have other thoughts.