comp380team3 / PuzzlePathDimension

Class project for COMP 380 at California State University, Northridge
0 stars 0 forks source link

There's two solution files #6

Closed Jjp137 closed 11 years ago

Jjp137 commented 11 years ago

There are two project (.sln) files so far, and it can become really confusing if someone works on the wrong one. Can we fix that before we do anything else?

And while we're at it, can we reorganize the folder hierarchy? I don't like how I have to click three folders named "PuzzlePathDimension" in order to get to the source code...

I might be nitpicky, though...

Twisol commented 11 years ago

And while we're at it, can we reorganize the folder hierarchy? I don't like how I have to click three folders named "PuzzlePathDimension" in order to get to the source code...

I agree - I think it would be best to remove the second "PuzzlePathDimension" folder, pulling its contents (the .sln and friends) up into the parent (with the .gitignore and friends). I believe the third one is necessary though; since the project is structured as a solution, it can technically have multiple Visual Studio "projects" contained inside it. It just happens that the project is named the same thing as the overarching solution.

By the way - I highly recommend that everyone create their own branch in git where they do their own work. You can push the branch itself up to GitHub and start a pull request to merge it into master. That should keep everyone from having to do random merges in the middle of their work.

Twisol commented 11 years ago

There are two project (.sln) files so far, and it can become really confusing if someone works on the wrong one. Can we fix that before we do anything else?

It looks like PuzzlePathDimensionSampleDemo.sln (and .suo) can be removed.

Jjp137 commented 11 years ago

Alright. Are you going to make these changes and push them, or should I do it?

Twisol commented 11 years ago

I can do that real quick right now.

Jjp137 commented 11 years ago

Okay. Thank you! :)

Twisol commented 11 years ago

Having a little trouble with Windows right now - it won't let me move or change certain folders. :frowning:

Jjp137 commented 11 years ago

Oh fun...

Meanwhile, I remember you saying in one of the first e-mails you sent out that we should fork this repository to our own user account, but earlier in this thread, you said that each of us should create our own branch for our own work. So I'm a bit confused; should we be pushing to our fork, which would then get pulled into the organization's repository, or should we clone the organization's repository, make a branch within it, and push to that branch, which would then get pulled into master? (Hopefully this doesn't sound confusing :)

I haven't done anything significant with my fork yet, so it doesn't matter either way...

Twisol commented 11 years ago

Either one works! Basically we just shouldn't all be working on the same master branch here in this repo. We should be working on our own branches and submitting pull requests through GitHub to have them merged in. Where the feature branches actually are don't matter to me as much.

I finally got it working, by the way. Changes up. (Yes, I pushed straight to master. XD)

Twisol commented 11 years ago

Fixed by fd4d72 (that's the SHA hash identifying the commit with the changes)