In Sourcetree if you go Tools -> Options -> Authentication you should see some saved passwords for cr. Go to Tools -> Options -> Diff and set the External Diff Tool and Merge Tool to P4Merge. This token is the same for all projects but you will need to login per project.
#SET GITCONFIG TO USE P4MERGE PASSWORD#
Make a note of this hex string as it will change each time you click the button, so if you click it again the password prompt will come up again when you try to do something.
The password is a token you need to generate by going to, navigating to your project, clicking your username in the top right, settings, Generate access token. The username is the email address you use to login to. This will try to check for new commits and will ask for credentials. This will add a new tab for your project in Sourcetree.Ĭlick Fetch in the top bar. In Sourcetree go to File -> Open and select the project root folder. You’ll end up with a folder with a game.project file in it, this is the root of your project and there will be a hidden. I find Defold’s built in diff tool lacklustre so prefer to use P4Merge to review changes before committing them.įirst use Defold to create/sync your project.
I don’t mess with branches but I think this would allow that too.
You could use other git clients and diff tools.Ī graphical git client like Sourcetree let’s me view the history of files and roll back to earlier commits. This might be useful for other people but mainly I’m writing this for my own future reference.
0 kommentar(er)
