PineappleStudios / Super-Pong

Testing out Unity/Git
2 stars 0 forks source link

PONG-9 Add Ball Controller #26

Closed Ghoublai-Khan closed 1 year ago

Ghoublai-Khan commented 7 years ago

One issue I ran into is that I'm having a hard time rebasing on to the stable branch because Austin and I both edited the tags which change TagManager.asset. It's a binary file so not sure what to do about that. I might have to scrap my tag changes and then re-make them after merging.

If you guys could try this out and see what you think sometime that would be great :)

Fixes #9

Ghoublai-Khan commented 7 years ago

I might try looking into http://answers.unity3d.com/questions/33597/is-it-possible-to-create-a-tag-programmatically.html for the tags

atb-brown commented 7 years ago

As far as the tags, yeah we can probably just scrap your changes and add them back. The important thing is that source code (which could reference the tags multiple times, leading to a lot more non-mergeable changes) works since it's non-binary.

In fact, that's an interesting thing to stumble on to. Maybe in the future, we only add tags to the tag list directly to stable?