Re: what do I do when git cherry-pick works, but results are bogus?

On Wed, May 17, 2023, at 9:44 AM, Rick Macklem wrote: > So, the subject line basically says it. > I do a git cherry-pick to MFC. It works, but the resultant file(s) are not > correct. What do I do to fix this? > (If the merge fails, then it's easy, but there doesn't seem

Re: what do I do when git cherry-pick works, but results are bogus?

On Wed, 17 May 2023, 17:44 Rick Macklem, wrote: > So, the subject line basically says it. > I do a git cherry-pick to MFC. It works, but the resultant file(s) are not > correct. What do I do to fix this? > (If the merge fails, then it's easy, but there doesn't seem to be

Re: what do I do when git cherry-pick works, but results are bogus?

On Wed, May 17, 2023 at 9:44 AM Rick Macklem wrote: > > So, the subject line basically says it. > I do a git cherry-pick to MFC. It works, but the resultant file(s) are not > correct. What do I do to fix this? > (If the merge fails, then it's easy, but there doesn't s

what do I do when git cherry-pick works, but results are bogus?

So, the subject line basically says it. I do a git cherry-pick to MFC. It works, but the resultant file(s) are not correct. What do I do to fix this? (If the merge fails, then it's easy, but there doesn't seem to be an option on cherry-pick that forces it into "merge failed",

Re: git question: How do I push a cherry-pick of someone else's commit?

> > > and it won't let be push the cherry-pick. > > > > > > > > What's the trick to doing this? > > > > > > You need to add --push-option=confirm-author to the git push invocation. > > Ok, thanks. > > > > It did try

Re: git question: How do I push a cherry-pick of someone else's commit?

On Thu, Jun 09, 2022 at 07:49:53PM +, Rick Macklem wrote: > Mark Johnston wrote: > > > > On Thu, Jun 09, 2022 at 07:30:47PM +, Rick Macklem wrote: > > > I just tried to MFC a commit done to fix my commit by imp@ > > > and it won't let be push the che

Re: git question: How do I push a cherry-pick of someone else's commit?

Mark Johnston wrote: > > On Thu, Jun 09, 2022 at 07:30:47PM +, Rick Macklem wrote: > > I just tried to MFC a commit done to fix my commit by imp@ > > and it won't let be push the cherry-pick. > > > > What's the trick to doing this? > > You need

Re: git question: How do I push a cherry-pick of someone else's commit?

On Thu, Jun 09, 2022 at 07:30:47PM +, Rick Macklem wrote: > I just tried to MFC a commit done to fix my commit by imp@ > and it won't let be push the cherry-pick. > > What's the trick to doing this? You need to add --push-option=confirm-author to the git push invocati

Re: git question: How do I push a cherry-pick of someone else's commit?

What is the error message? Did you try “git push -f” > On 9. Jun 2022, at 21:33, Rick Macklem wrote: > > I just tried to MFC a commit done to fix my commit by imp@ > and it won't let be push the cherry-pick. > > What's the trick to doing this? > Or do I need

git question: How do I push a cherry-pick of someone else's commit?

I just tried to MFC a commit done to fix my commit by imp@ and it won't let be push the cherry-pick. What's the trick to doing this? Or do I need to get Warner to do it? If so, it's 393b7606f9c1 in main, that needs to go into stable/13. rick ps: The stable/13 build will be broken

Re: git MFC/cherry-pick question

On Thu, Jun 3, 2021 at 8:29 PM Alan Somers wrote: > On Thu, Jun 3, 2021 at 8:13 PM Rick Macklem wrote: > > > Hi, > > > > I am trying to MFC a commit to stable/12. > > The cherry-pick works, but the resultant code > > is not correct and won't build

Re: git MFC/cherry-pick question

On Thu, Jun 3, 2021 at 8:13 PM Rick Macklem wrote: > Hi, > > I am trying to MFC a commit to stable/12. > The cherry-pick works, but the resultant code > is not correct and won't build. > --> I broke the build yesterday and manually >reverted the breakage. >

git MFC/cherry-pick question

Hi, I am trying to MFC a commit to stable/12. The cherry-pick works, but the resultant code is not correct and won't build. --> I broke the build yesterday and manually reverted the breakage. So, how do I do this? Do I have to manually edit the file after the cherry-pick and

Pick

Hey Bro, Check out this pick. It's GUARANTEED TO WIN. FAVORITE LINE UNDERDOG Raiders 4 Bucs Take RAIDERS. My source is NEVER wrong. Get back to me when you win and have fun counting your

Stock Pick of the Week

>>> STOCK PICK OF THE WEEK <<< For the week beginning Monday, 10-16-2000 Investment Snapshot - ATTP -- Affordable Telecom http://moneycentral.msn.com/scripts/webquote.dll?iPage=qd&Symbol=attp Target Price: $1.00 Current Price: $.20 Take a close look at this stock, i

Stock Pick of the Week

>>> STOCK PICK OF THE WEEK <<< For the week beginning Monday, 10-16-2000 Investment Snapshot - ATTP -- Affordable Telecom http://moneycentral.msn.com/scripts/webquote.dll?iPage=qd&Symbol=attp Target Price: $1.00 Current Price: $.12 Take a close look at this stock, i