Conversation
trini@floss.social

Tom Rini

@monsieuricon b4 question for you. When I'm using shazam -S and git am has a conflict, it drops to shell and I can resolve like normal. However, -SM will just fail rather than let me resolve the merge. Is there some way to have it let me try and resolve the conflict? Thanks!

1
0
0
monsieuricon

K. Ryabitsev

Reply to @trini@floss.social
@trini @monsieuricon You can `shazam -SH` and then manually merge FETCH_HEAD.
1
0
1
trini@floss.social

Tom Rini

Reply to @monsieuricon

@monsieuricon@social.kernel.org @monsieuricon@people.kernel.org I'll try that next time, thanks!

1
0
1
trini@floss.social

Tom Rini

Reply to @trini@floss.social

@monsieuricon@social.kernel.org @monsieuricon@people.kernel.org Finally hit this problem again. -SH also will say a patch fails to apply, fail and then say not fetching into FETCH_HEAD. b4 0.13.0, and `b4 shazam -SH -P 2-15 20240811122924.4035982-3-sjg@chromium.org` on top of d2067c3ea541 in U-Boot if you're curious enough replicate. I'll probably just tell the author to rebase that too on top of current next tomorrow. Thanks again!

1
0
0
monsieuricon

K. Ryabitsev

Reply to @trini@floss.social
@trini Ah, right, this is a different situation. I thought you were having trouble merging it in, not applying. You can't really use shazam in this case, just b4 am and then manually running "git am".
0
0
1
About social.kernel.org

Terms of service

  1. Please do not use this service in violation of the Linux Kernel Code of Conduct. Doing so will result in your account suspension with the referral of the matter to the CoC committee.

  2. "Repeating"/"boosting" someone else's status on this platform will be treated as endorsement and will fall under rule #1.

  3. You are encouraged to use this platform to promote your work on the Linux Kernel, but there is no restriction on permitted topics (with the exception of anything covered by #1 above).

  4. There is no requirement to post in English, but it should be considered the primary language of communication on this platform.

Privacy notice

The admins of this service have access to all posted statuses. They aren't looking, but if it's something they shouldn't know about, then you should not post it on this platform.

Please see the Linux Foundation Privacy Policy, which applies to this platform as well.

Getting your own account

If you would like an account on this instance, please check that the following applies to you:

  • You are listed in MAINTAINERS or CREDITS

  • OR: You have a kernel.org account or email address

  • OR: You have a long and established history of involvement with the Linux Kernel

If the above is true and you agree with the Terms of Service and Privacy Notice listed above, please use these instructions to request an account: