When version controlling your code with git, there are generally three choices when merging feature branches into main.