Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,297,388
Community Members
 
Community Events
165
Community Groups

UE4 & Source tree not displaying checked out file

So i recently moved over from Perforce to source tree, and i have a file checked out but on my other team mates work station it doesn't say that the file is checked out.

 

Its causing issues when we are not communicating (due to time zones) but both editing the same file inside UE4.

 

Thanks,

 

1 answer

0 votes
minnsey Atlassian Team Aug 22, 2018

Hi

Assuming you are using Git then Git does not include the concept of locks or exclusive checkouts. Usual working practice is for each person to be walking on their own branch which is then merged in to master, or similar main branch, after pull request/review.

Okay so with perforce two people couldn't be working on the same script so my issue is if we have both done work on it and then committed it what would happen to say my changes?

 Would they be overwritten on can sourceTree merge the Binaries so both our work is kept?

minnsey Atlassian Team Aug 28, 2018

If it was a text based file, Git would manage merging the two sets of modifications. That process doesn't work with binary files so the last commit/merge wins.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Bug Fix: Sourcetree for Windows authentication error when updating to app password

Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...

61,655 views 127 27
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you