search

antfarmar / Unity-3D-Asteroids

A simple Asteroids clone. In 3D.
The Unlicense
65 stars 15 forks source link

Diverge Branch: Pulling devmelon's implementation #25

Closed antfarmar closed 8 years ago

antfarmar commented 8 years ago

Attempting to create a new branch diverge to pull in @devmelon's work on his diverge branch for archiving.

Not really what branches are designed/meant for though. We'll see how this experiment goes. :laughing:

antfarmar commented 8 years ago

Woah. Way too many conflicts :laughing: Clearly this is not the proper way to go about this. (re: a branch archive) I'll probably just download devmelon's source as a .zip and go from there.

antfarmar commented 8 years ago

Welp, something worked with the pull request.:+1: :laughing:

The archive is now on branch pr/25, but it also merged/pulled-in the master branch along with it while resolving conflicts. Makes sense, since this is where it branched off of. Good thing @devmelon placed most of his implementation in a new root folder!

I could clean out the new pr/25 branch, but I may just properly make a new repo for it instead though.

antfarmar commented 8 years ago

Created a clean devmelon/master branch which is currently just his files from his diverge branch.