Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GitHub merging suuuuuuucks #19

Open
WilliamShimizu opened this issue Mar 3, 2013 · 2 comments
Open

GitHub merging suuuuuuucks #19

WilliamShimizu opened this issue Mar 3, 2013 · 2 comments

Comments

@WilliamShimizu
Copy link
Owner

We should do some tests tomorrow to make sure we can work asynchronously. I had to completely re-pull the repo when I got to my PC because I had uncommitted changes (they were barely changes at all). We'll have to sync up via skype or phone and do some tests involving timing and such.
@ghost ghost assigned bendvis Mar 3, 2013
@WilliamShimizu
Copy link
Owner Author

Also, since I have the template for MonoGame installed I added all the projects using the MonoGame template and set the output type to Class Library instead of Application.

@WilliamShimizu
Copy link
Owner Author

I'll be slammed with Calculus for the rest of the day, so I won't be doing any more commits today, so there shouldn't be any worry of merge conflicts if you want to make any commits. Also, take a look at the hierarchy doc. I updated it adding which package each class should belong to.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@WilliamShimizu @bendvis