Danny
-
Posts
18 -
Joined
-
Last visited
-
Days Won
1
Posts posted by Danny
-
-
Is there any way to verify that the external merge tool that I setup in "Preferences>Merge Tools" is being used?
thank you
-
It usually works, but occasionally an ignored folder/file shows up. The particular folder below has been successfully ignored for weeks and is just now showing up. Any ideas? Thanks
-
Just hit the same issue. Global lock doesn't seem very useful and has a fundamental flaw of not actually preventing conflicts between branches (until "traveling locks" are implemented). We were also planning on branching one way and never merging back at some point, for porting reasons. "Traveling locks" might make that impossible. I suppose we'll look into pushing the branch to a different repo, but it is always nice to have the option to merge later, in case we didn't plan ahead perfectly.
Ideally locking would be branch specific. For our use case, I'd rather have merge conflicts that I manually resolve for binary files than global locking. Locking is nice for our main branch for day to day work, though.
thanks
-
This is urgent for us, we are delivering our game right now. Could someone check if they have a connection? Is there a place to check server status?
thank you,
-
I move in Unity but I turned the plugin off temporarily because it really slows down editing a prefab.
I can plan my moves more carefully, no big deal. I work sloppy and fast sometimes, probably not a good practice
thanks!
-
Cool thanks!
move detection had false positives on some of my png files (I've attached one of them below). Can I disable for binaries entirely?
It would be nice if I could do the 'auto detect move' function on demand (from the right click context menu) for only selected files
-
The automatic move detect has not worked well for me so I disabled it. I'm wondering if there is a way I can manually select a delete/add pair of files and specify that it is actually a move operation?
thanks,
-
Select them, right click, and press "Apply Local Changes"
-
bump, I just ran into this for lots of files, quite painful
- 1
-
I can't move these to another changelist and I can't seem to figure out how to check them all out (without navigating to each one), any ideas?
thanks
-
ah very cool, thanks!
-
nice
the user/appdata/local one worked, but the global repo config didn't seem to work. Does the global config repo not work in cloud?
-
I changed my project from binary serialization to 'forced text'. All my assets are now text. Based on the error message "Changing the revision type is not currently available in the cloud server", it seems my only option is the start a new cloud repo, is this correct?
thanks
-
thanks! I've been using Plastic for a few days now and really liking it.
Are there any plans to add organizing pending changes into groups (like perforce's changelists) and shelving for the individual pending changelist?
-
thanks, I think the Unity Plastic SCM plugin is explicitly checking out the .asset or something. I've checked the option you described but the problem still exists
any other options?
thanks
-
thanks, I'd like to start over then, everything I've checked in is for evaluating Plastic SCM at the moment. Who can I contact?
I do not have a server folder in [User]\AppData\Local\plastic4
or anything related to plastic in C:\Users\[User]
thank you
-
I realize now I do no want encryption, how can I disable it? Thank you
Also, how do I find what password I used for encryption? cryptedservers files (as mentioned in a previous thread) doesn't appear to exist on my computer
Verify External Merge Tool is being used?
in General
Posted
Thank you, I'm more interested in if there is a log output somewhere that says "xyz was merged with [tool]" or something?
If not, would be a nice feature. Since the file is text and the external tool I'm using is for semantic merge of a specific file structure, its not obvious if the tool was used or not sometimes.