PlaceholderGames / 2022-yr2-team-gemini

Second CS2S561 Game
0 stars 0 forks source link

"testing" branch #50

Open 30001606VA opened 2 years ago

30001606VA commented 2 years ago

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.

30001606VA commented 2 years ago

In the future, look for this button to see if your branch is up to date with main or not:

image

Don't know if it works but it should do something hopefully