Nefisto

Hi @ollieblanks, thanks for the answer, your information with this thread https://forum.plasticscm.com/topic/20639-unityyamlmergeexe-error-in-merge-tool/ has solved my problem, I just had to change the merge tool manually. Thanks for your time

I've created a branch in an old checking to test things, but now I cant go back... this is current scenario, I`m working on branch C But when I try to merge it with branch B or A this happens Can someone help me to solve it?

The title is self-explanatory, during the last year I was invited and evangelize about plastic to some guys that I met during the journey, and now I want to remove myself from some older/not related organizations, but I didn't find the button.

I don't know if this is a bug or what, but I'm getting this kind of problem often, isn't really a problem because we can easily workaround, but i thought that would be nice to post this here. Sometimes, normally when changing folder location and/or renaming/deleting folders, plastic say that he can't locate a revision, but if you checkins things in "correct" order (apparently we have a correct order) it just work, I got this problems this Hope this help 2021-09-08 08-14-53.mp4 morning and make a video to illustrate it

A reset in unity editor has fixed it, sorry, I was scared

At moment I'm working in a tool that use [SerializeReference] to serialize derived classes on inspector [SerializeReference] private List<Drop> drops = new List<Drop>(); But today I decided to drop the support for this inheritance behavior and removed the abstract from this Drop, after some setup everything works just fine, I removed the serialize reference and checkin my changes. But then I changed to an older changeset and all references to this drops has been lost Where we see "Element 0" now initially is a children of Drop. It is not real a problem for my current scenario, because I will work with this non-abstract Drop class from now on. But this literally broke all my past change sets, if I was trying this only to test this would became a problem. So what I want is to understand what I can do to avoid this situation to happen in a worst case, because the idea of a change in some changeset break all other changesets is not something acceptable Thanks for help

Hi, i see, and if the checking still locally only? this helps in any way? Really isn't hehe BTW thanks for really fast answer 😜

Sometimes after I do a check-in I saw or remember that I forget something that should be done in the same check-in. What I normally do is make a new check-in with some comment that says my error. The question, can I mix this new wrong check-in in the old one?

I understood, this is a great way, maybe I only wanna have some kind of warning to actions that will make my account goes from free to paid, but its ok A question about this, using the case that I described in first post, if someone from my team download the last version of project in next year for example, him will count as an active user in current month? Thanks for help

So u mean that change my subscription from free to paid is expected? isn't this 2 cloud edition?

Last month I participated in a game jam with other 3 people (first time using plastic with other people and the experience was awesome), I added them to my company, created a group, and set configurations to view the current project only, and all just work, life is good \o/ Yesterday I received an email about my trial period coming to an end, but I don't remember to change from my free edition. After some research I saw that the free edition can have up to three, so I think that what had happened is that when I added people last month plastic automatically changed my subscription to trial, but I don't remember receiving some warning about changing my plan or something like that. Now the questions. 1/ Is this right, it's supposed to change my plan automatically or I misunderstood something? Because now plastic is charging me a value for a user per month, but if I knew that I had to pay for that extra user I would insert only 2 of them 2/ If I'll participate in another short project (like a game jam) I need to remove people from older project to add new ones, I mean, they probably will not touch the project again, but maybe at some moment, they wanna saw the code or something like that, what am I trying to say is, do I have some way to let they see or download the files from this project without count they as participants of my company? 3/ I've made the mistake of cancel the subscription, but now I've lost access to all my projects, and now to recovery I need to pay the value, what I don't think its fair, do I have other option?

Sorry for late replay, I'll take a look at it, but only to clarify, as scenes (.unity) is an binary file, are u saying that i cannot really "merge" changes in same scene and the better option is lock file?

But how am I supposed to handle this? This error happens when distinct objects are changed in same scene, do I need to create somekind of main scene that only some ppl can change? I rlly don't get it, because in my point of view we don't really have an "merge" in yaml, because the changed parts aren't common. Anyway, thanks for help

When we make changes in same scene (any change) and try to merge, plastic had started to say that had some misconfig in merge tools (as image below) So, I found this thread in forum that talk about exactly same problem: https://forum.plasticscm.com/topic/20639-unityyamlmergeexe-error-in-merge-tool/ But after follow the solution in thread I started to receive this error: Can someone help me to solve this? In my client.conf: <MergeToolData> <FileExtensions>.prefab</FileExtensions> <Tools> <string>"C:\Program Files\Unity\Hub\Editor\2019.4.17f1\Editor\Data\Tools\UnityYAMLMerge.exe" merge -p "@basefile" "@sourcefile" "@destinationfile" "@output"</string> </Tools> </MergeToolData> <MergeToolData> <FileExtensions>.unity</FileExtensions> <Tools> <string>"C:\Program Files\Unity\Hub\Editor\2019.4.17f1\Editor\Data\Tools\UnityYAMLMerge.exe" merge -p "@basefile" "@sourcefile" "@destinationfile" "@output"</string> </Tools> </MergeToolData> In merge tool pref:

Hey Carlos, I spent this morning migrating to a new workspace, so the problem is solved. Anyway thanks for your attention