Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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
Posted in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

3,202 views 19 18
Join discussion

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