ctubbsii commented on PR #5922: URL: https://github.com/apache/accumulo/pull/5922#issuecomment-3326000477
> > @ddanielr I see you merged this into 2.1, but did not merge forward into main. It's currently holding up subsequent commits on the 2.1 branch from being merged to main. Are you working on that merge to main? > > This was merged to main around 2pm est [6e3ca6a](https://github.com/apache/accumulo/commit/6e3ca6ae21ffa9a77511f4d1eba3012b2d50ad1a) That's not a merge commit. It looks like one, but only has one child. I think you squashed it locally when you tried to merge. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
