#SOURCETREE RESOLVE CONFLICTS HOW TO#
#SOURCETREE RESOLVE CONFLICTS ARCHIVE#
#SOURCETREE RESOLVE CONFLICTS SOFTWARE#

Click the Browse button besides Destination Path and specify where on your computer you'd like your copy of the project to reside.

A popup should appear prompting you to login to GitHub.

Enter the project's GitHub URL into the Source Path / URL field, e.g.

You should be fine to untick all of the modules to install, but you might want to confirm with someone else on the teamįor this exercise we'll assume the Git repository is being hosted on GitHub, and that you already have a GitHub account with permission to access the project.

#SOURCETREE RESOLVE CONFLICTS ARCHIVE#

Ask the team what Unity version is being used for this projectįind the correct version in the Unity Download Archive and press the button to download via Unity Hub.Press Add, Get a free personal license, Accept (assuming you meet the criteria!).Press the cog to open Preferences if it's not already open, and select the Licenses tab.Click the profile icon to the top-left to login / create a new account.You'll need to sign into Unity and activate a license to use it: The other default values seem to be fine so you can click ok ok ok if you like.You should use the same values here as what you use for your GitHub/GitLab/other account It'll ask for your name and email address at some point.Note that you can skip the Atlassian sign-in step!.If you are changing some things, make sure you keep the 'Git from the command line and also from 3rd-party software' option selected in the 'Adjusting your PATH environment' sectionįollow the prompts on the official SourceTree website to download and start installing the Git client.All of the default values are fine for installation so you can click next next next next if you like.Installationįollow the prompts on the Git for Windows website to download and start installing Git In this post I'll be talking about using SourceTree. Other Git clients can be installed, many of which include graphical interfaces, to make Git's underlying functionality more accessible.

#SOURCETREE RESOLVE CONFLICTS SOFTWARE#

The official Git software can be prohibitively hard to use for many, as it's a command-line tool without a graphical interface. Something to add to that last point is the existence of Git Clients. The 'What's the difference between Git, GitHub (and others)' section of Git For Misfits (and artists) by Lee Tusman (although it's a good read overall if you'd like).

Then collaborators need to fetch or pull those commits down to their local repositories

Something that is in scope but wasn't covered is that your commits will only live on your computer until you push it to a server.

The branching and merging parts are out of scope for this guide so don't worry if it seems difficult.

Git Explained in 100 Seconds by Fireship gives a short explanation of how it works.

What is Git? Explained in 2 Minutes! by Programming with Mosh gives a good high-level explanation of why something like Git is useful.

I won't pretend I'm the best writer for this kind of stuff 😛 Here's a hyper-focused list of things to watch/read about it: It assumes that a Unity project already exists and has a Git repository that you want to work with, managed by someone with more Git experience. This article is for non-programmers who need to work with an existing Unity project and don't need to get too deep into the Git world. I've found myself having to help people through this a few times at game jams and other projects so I'm trying to write it up for future 😛

#SOURCETREE RESOLVE CONFLICTS HOW TO#

Bilal Akil How to Use Git (via SourceTree) with an Existing Unity Project

Sourcetree resolve conflicts