Looks like "testing" branch is going to be my new main branch because my other branches are screwed because of the merging conflict error that Sean also got. This branch has the changes I pushed along with Sean's changes so hopefully, as long as we all use branches well, we should be ok.
Looks like "testing" branch is going to be my new main branch because my other branches are screwed because of the merging conflict error that Sean also got. This branch has the changes I pushed along with Sean's changes so hopefully, as long as we all use branches well, we should be ok.