Test PR

[timburg1]

@shoogle asked me to create this test PR because we're troubleshooting my Git setup.

• I signed the CLA
• The title of the PR describes the problem it addresses
• Each commit's message describes its purpose and effects, and references the issue it resolves
• If changes are extensive, there is a sequence of easily reviewable commits
• The code in the PR follows the coding rules
• There are no unnecessary changes
• The code compiles and runs on my machine, preferably after each commit individually
• I created a unit test or vtest to verify the changes I made (if applicable)

[shoogle]

@timburg1, great job!

Now that the PR exists, you can update it simply by committing and pushing to the I27696 branch on GitHub.

If it's a new commit, you can do git push. If you rebase or amend a previous commit, you have to force push (i.e. git push -f) in order to confirm that you want to overwrite the history.

Whenever you're about to push, you should first rebase and recompile locally to make sure you have the latest upstream commits and that everything builds correctly on your machine. This is much faster than waiting for the CI builds to complete.

git pull --rebase upstream master

When you rebase, Git might warn about merge conflicts. If so, you have to fix those manually. Run git status and git diff to see which files have conflicts, then look for the conflict markers <<<<, ==== and >>>> in those files. Within the markers, you have to pick one version to keep and one to delete, or you can edit the code to keep some aspects of both versions. Once this is done, and you've deleted the markers, add the files (git add .) and confirm with git rebase --continue.

But that's only if there are conflicts. Most of the time there won't be any conflicts, so you can proceed straight to compile and then push.