Make changes on main branch, then switch branches, causes main branch to have auto generated changes

So I want to know if anyone else is dealing with this. Here is what I have done:

  1. Open an API in the API Builder (has to be synced with repo) on main branch
  2. Rename a collection within that API
  3. Realize you were on main, and switch to another branch.

Here is the first issue:

  • None of the changes you made on main branch migrate to the new branch, as is normal in git workflows.

Continuing on:
4. Switch back to main, then click the discard changes button in the source control pane.

Here is the second issue:

  • There is an auto generated file that you cannot discard the changes for, which causes issues with sync and publishing api versions:
    image

Has anyone experienced any of these two issues?
How do you get rid of the changes on the auto generated file? I need to publish a version and can’t get rid of this.