How to pull upstream code

Use a custom script:

./scripts/pull_upstream_triton.sh <branch_name>

For example

./scripts/pull_upstream_triton.sh main

Then you can view the conflicts of our modified code in conflict-merge format.