Mud-H Posted February 25, 2015 Share Posted February 25, 2015 After a while using Git for various projects, I'm getting more confortable with it but I'm still not sure what's the best way to develop using the Torque3D repository. Since I have never work on a Git project with a team, I'm still confused about how to set an efficient Torque3D git system and I always end up starting from scracth with a new repo.I'm not asking for a Git tutorial but more about how to use Git with Torque3D efficiently by allowing me to simply merge latest commit into my files without messing up with my changes.So here how I'm setting up my fresh repository for a project which will have limited code changes.First, I forked Torque3D on GitHub and cloned it to my PC. Next I created a new private repository on BitBucket. Now I want to use the private BitBucket one as default remote and I will use my GitHub fork to fetch Torque3D commits. (To get changes from a commit I should use Fetch and not Pull, right?)In that case, should I not use a Torque3D fork and simply use the Torque3D official repository? I'm not 100% sure about how forks work but while typing this I think my private BitBucket repo will acted as a fork?Now, how I proceed if I want to include changes from a Forked T3D repo? I add the Torque3D fork repository to my remote repository and Fetch the wanted branch into my default repository by creating a new branch? Then I can merge that branch into on of my work branches? What happen if I have modify the same files, it will ask me to resolve conflicts and should decided which to keep?I'd really like to know how contributors to Torque3D use Git. Someday, I'd like to contribute but before I need to have an effective Git workflow established. I have never used Pull Request. How you manage your Git setup to create Pull Request, you put all the changes in a Branch and the diffs are used for the Pull Request?Can experienced Git users post a simple description about how they use it to develop on Torque3D. I use mostly SourceTree but I'm starting to move to GitExtensions since I understand Git better.. Quote Link to comment Share on other sites More sharing options...
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.