[llvm] [FileCheck] Fix --enable-var-scope for numvars after reassignment (PR #157158)

[James Henderson via llvm-commits]

jh7370 wrote:

> Wait, I thought merge commits were not allowed. Does the GitHub bot automatically sync the changes to make a linear git-history? If so, why do we need to update the branch / avoid that it goes out-of-date with the base branch?
> 
> Is there any docs about this?
> 
> (btw thanks for merging!)

The default setting is "Sqaush & Merge", which squashes the commits together and rebases them on the tip of `main`. This has the effect of removing all merge commits from `main`. In other words, doing a merge from `main` is the correct way of rebasing within a PR, since it avoids messing up any in progress review.

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