ddanielr commented on PR #5922: URL: https://github.com/apache/accumulo/pull/5922#issuecomment-3326017789
> > > @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. Yeah I realized that after linking the commit. Something else had been merged to main while I was dealing with the conflicts and I thought I had reset my branch state correctly. Anyway I just completed the 2.1 -> main merge and pushed again. commit history on `main` now includes 5315ad2ee9b17c5542d4ba3a3099266d20d78c55 -- 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: notifications-unsubscr...@accumulo.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
