00:00
00:00
Gagangrene
Equine and Eldritch both start with "E"
Profile pic by: https://twitter.com/tater_art

Age 22

None

Colorado

Joined on 10/5/15

Level:
7
Exp Points:
459 / 550
Exp Rank:
> 100,000
Vote Power:
4.90 votes
Art Scouts
1
Rank:
Civilian
Global Rank:
> 100,000
Blams:
0
Saves:
9
B/P Bonus:
0%
Whistle:
Normal
Medals:
100
Supporter:
4y 4m 11d

Git repositories, help me out here.

Posted by Gagangrene - March 11th, 2020


So some 40 days ago, me and my team were in a creative jam, and we got overwhelming issues because we used a Git Repository like an SVN repository, and more importantly put .gitignore in a bad place without knowing it was in a bad place.


So the main issue was that We have our Root directory, then within it the .gitignore, and right next to it, the Unity Project root folder. It should've been in the Project directory, not next to it. I figured this out on February 10th, a full week after Creative Jam was over.


A lot of what we did in the repository was push files straight to the master branch, while more than one of us were working on the master branch at a time. What we should've been doing is working on separate branches, and then merging branches when we needed files, just as good practice.


Also, today I learned the big distinction between commits and pushes, or at least I think. Commits are purely local. Pushes are just letting everyone else pull those commits.


Comments

What exactly are you working on?

This was a Game Jam game. Nobody, myself included, is working on the project currently, but I've moved the .gitignore to the right place since the jam was over. There's currently no problems with the repository because there was only me cleaning it up, then stopping. My issue is that I'm not 100% sure what I did, and I'm not sure why I should work on a separate branch, and just general uncertainty.

@phenorax I'm also hesitant to give a straight answer because the game doesn't exist online.