[Mlir-commits] [mlir] [mlir][affine] Add Check for 'affine.for' Bound Map Results (PR #127105)

[Uday Bondhugula]

bondhugula wrote:

> > You can simply do `git pull <upstream> main --rebase` and then do a force push (to your fork branch). Then squash and merge from here.
> 
> <img alt="Screenshot 2025-02-20 at 5 54 10 PM" width="901" src="https://private-user-images.githubusercontent.com/121697771/415437639-89544a81-03d1-404f-b0a4-dc3a81e8a5cf.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3NDAyMDQzNTcsIm5iZiI6MTc0MDIwNDA1NywicGF0aCI6Ii8xMjE2OTc3NzEvNDE1NDM3NjM5LTg5NTQ0YTgxLTAzZDEtNDA0Zi1iMGE0LWRjM2E4MWU4YTVjZi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjIyJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIyMlQwNjAwNTdaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0xYzk5MmFjYjNmOGEwM2Y3Y2ZhMzQ4ZmZjMTNhMjUyYTJmODlmY2M2NjQ2N2ExNmZkNjhiMjFhOWFmOTk3NzFhJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.ZwUgsw_lRH9aM7cG4gSyF_a2Jj05YWAHKtxnzhvI00Q"> <img alt="Screenshot 2025-02-20 at 5 55 17 PM" width="879" src="https://private-user-images.githubusercontent.com/121697771/415437968-4a14df2f-fded-4eb7-b825-9ab0dc4ed522.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3NDAyMDQzNTcsIm5iZiI6MTc0MDIwNDA1NywicGF0aCI6Ii8xMjE2OTc3NzEvNDE1NDM3OTY4LTRhMTRkZjJmLWZkZWQtNGViNy1iODI1LTlhYjBkYzRlZDUyMi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjIyJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIyMlQwNjAwNTdaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT1jYzIxNjJkMWE4MGQ4MTM3NTY0NWUwOGNiOWEyZTJjNzFkYzM1YjU3MDI1OTEyMWExNGFiNTk4NWIzNDM5ZmJjJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.9-LUobjTVeg08UoWIsyswquaVfV71mcn-aHynrc1ePY">
> So I just did that exactly on my local, but it's still saying saying merging is blocked - and I don't have any merge commits. Have no clue why.

You need to have selected "Rebase branch" among the two options on the side. I did it and it had not issue squash and merge.

https://github.com/llvm/llvm-project/pull/127105