-
When several developers are working on the same project and the same code-base, it can quickly become very messy and very hard to keep track of all the files and changes. So it's very useful to use some sort of version control system to keep track and merge files cleanly. With the current hosting plan we have here at TorchModders, it's not possible to host a version control system.
However, there's a great free service called Bitbucket, where you can host code privately and share it with up to 5 collaborators, for free. Bitbucket use Git as its version control system, which can appear somewhat daunting at first. But there is a great GUI front-end for Git, called SourceTree, which integrates smoothly with Bitbucket. And this combo makes it quite easy to use Git as version control for novice developers.
If you're not sure what version control, or Git is. I suggest you watch the first two videos found here:
I also found these videos, which explains using Bitbucket and SourceTree:
How To Use GIT and SourceTree - For Beginners
Bitbucket for Git - Source Tree Tutorial
I will try to create a step-by-step guide on how to set it all up. It might take me some time, but I really suggest have a look and considering using this for collaborative development. -
-
Slacker and I have been using this setup for a few hours now, and it's a dream to work like this. No more sending zipped files and messing about with folders and individual files. Just Pull the latest code from the repo. Start GUTS and do your thing, then Commit and Push back up to the repo again.
-
-
The push-back is straight from GUTS into GIT? That does sound fantastic!
-
-
Well yes, sort of. You sync (pull) from Bitbucktet with Git (SourceTree) to any local folder on the PC. So you use a sub folder in GUTS path, just like any other mod project. So when you're done working in GUTS, you use Git (SourceTree) again to push the changes back up to Bitbucket again, and the circle starts over.
-
-
This sounds great.
-
-
How is it for supporting the "info sharing" aspects of collaboration, basically commenting and discussions and that sort of thing?
-
-
On Bitbucket you can have a Bug Tracker and a Wiki for your project, in addition to the version control. How much of this is used and if it's open to the public is up to the project owner.
I use it mainly to share TLA code with Slacker, and anybody else who wants to contribute. I might also use it to keep track of bugs and issues. -
-
Thanks Wolven! I'm gonna give it a serious read-through tonight.
@gytfunke @RnF I am thinking, since it seems we need to re-do the TL1CP project on the joomla tracker anyway, we might want to try using this instead. What do you guys think?
From another angle, @Wolven does this weaken the positioning of TM as a modders' resource hub? -
-
I don't think it weakens us in any way. It's an optional free service. So is what we provide here. Our greatest resource and value are our combined skills and our will to cooperate and help each other. After that I'm guessing it's the forums and the wiki, which are our greatest resources. How we choose to facilitate ourselves in regards to code sharing, development and issue tracking is less important and does not take away anything IMHO.
-
-
Yeah, I'm down with using it, Phanjam.
-
-
So, any helpful hints for this?
I was doing the tutorial and when I went to 'push' it asked for my BitBucket password and login. I provided them. Several times. Unfortunately, it refused to recognize them. I'm stuck at this point. -
-
Have you set up the SSH keys? http://youtu.be/BtEvnE79jxY?t=2m30s
Also: I had problems at first, because I'd forgotten to to fill in user name and email, under Tools --> Options : General -
-
Hi! Thanks for that vid-tut @Wolven! I'll need to go back over it few times more, but it was right on the money
Sorry, I'd been posting my Sourcetree adventures over in the TL1CP public forum. Let me update in here...
I got a push going and it seemed to be proceeding okay. But about 2 hours into the upload, it errored-out
I copied the error message to the clipboard, but lost it when I copied something else without thinking!
I didn't use the SSH key method. Is it preferable to use that rather than https?
Now it gets weird...
On a whim, I checked in the "source" tab of our repo on bitbucket - and there were all the files!
I'm still visually comparing them with what I have locally, to see if they are the same and not truncated (MY EYES!). But if there is an automated way to do this, PLEASE let me know LOL! -
-
I have started making local changes (laying-in RnF's Aug.18 updates and my own updates for the skill-tree tab art).
In the sourcetree "branches" view, the top window has a line "uncommitted changes" which I believe are these changes that I've been making.
I guess I should commit them, but to where? I've made a "branch" for these updates, but I'm still lookng for good reading on how to commit the changes into that branch only, leaving the trunk alone. Or should they go into a branch at all?
I defenitely don't want to "push" anything up to bitbucket until I'm more confident I'm doing things right.
I hope we can work-out some kind of rhythmn for this. -