Trinity Developers READ ME FIRST!

[rrrix]

Trinity Developers READ ME FIRST!​

The "master" branch on Assembla will usually have the current development code: https://www.assembla.com/code/unifiedtrinity/git/nodes

The SVN on Assembla will always have the current release: https://subversion.assembla.com/svn/unifiedtrinity/

If you are developing additional functionality into Trinity, and would like your code customization's merged with everyone else's to be included in the Unified project - you HAVE to do this:

1. Create a fork of the DeveloperOnly branch on Assembla: https://www.assembla.com/code/unifiedtrinity/git/forks
2. Modify trinity as you see fit
3. Refresh your fork with the latest code from the master branch ("Pull") if it's been more than 1-2 days since you checked it out
4. Push your code to your fork
5. Submit a merge request
6. I will merge it if it's not horrid (and maybe even then if it fixes a big problem ... )

If you don't work off the developer branch, you'll probably be using old code and it's going to be a pain in the rear-end to merge what you've done. Trinity check-ins happen daily, and there are many, many changes in all parts of the project. Everything from the UI, the cache system, abilities, etc.

I personally test this branch daily to make sure it compiles and any new features are working as intended.

If you have questions about developing Trinity, feel free to create a new thread rather than replying to an old one, so questions and answers related to your particular work can be easily tracked.

Thanks!

rrrix

---

P.S. This is not required if you want to permanently fork your own project, and distribute it as a simple zip in your own thread. Just don't ask me to merge it 2 weeks later...

We don't work very well with zip files that are days or even weeks old, since by then I've probably already re-built what you're working on, fixed whatever bug you're fixing, or refactored whatever original plate of Giles' spaghetti you decided needed refactoring, or someone else has.

---

Quick links:

master branch: https://www.assembla.com/code/unifiedtrinity/git/nodes

Fork the code here: https://www.assembla.com/code/unifiedtrinity/git/forks
Submit a merge request here: https://www.assembla.com/code/unifiedtrinity/git/merge_requests#open

Changeset stream: https://www.assembla.com/spaces/unifiedtrinity/stream (what is everyone working on)

Instructions on using Git: https://www.assembla.com/code/unifiedtrinity/git/repo/instructions

Git extensions for Visual Studio: gitextensions - Git Extensions is the only graphical user interface for Git that allows you control Git without using the commandline. It comes with a manual and video tutorials to get you started quickly. - Google Project Hosting
(Visual Studio extension does not work in Visual Studio Express versions - but the git GUI tools work with or without Visual Studio)
Note: Git Extensions has GREAT manual. Read it! (So you know what merging, checkouts, branches, commits, etc mean)

 

[rrrix]

[Guide] How to Clone Git Repositories

This is a guid on how to clone Trinity from the development branch of Trinity.

1) Download a Git client. I am going to use Git GUI v1.8.2 in this example

2) Once installed find a git you wish to clone(copy).

3) You want to open up Git Gui next. You can open it under your start menu or simply load up windows explorer. Right click and select Git Gui.

4) Click Clone Existing Repository

5) Should be 2 open field boxes. Source Location and Target Directory. Source location is the git's address ie git://git.assembla.com/unifiedtrinity.git . The target directory is simply where you want to put the files at. The folder should not already exist. Git will make a new folder for you

6) Simply press the clone button once you filled in the boxes. Something like this should pop up. Just wait a few minutes while it is downloading the git folder.

7) Once it is done this should appear. You can now close out git. Check back to the directory you designated and your files will be downloaded there.

8) Now this will download the entire folder so in the case of Trinity open up the new folder. Inside the Source folder should be the latest Trinity.


Hope this little guide helps people having issues with git. I tend to just clone new versions of plugins instead of just updating them. Just in case something goes wrong in the newest update I still have a backup.