Jump to content

Nefisto

Members
  • Content Count

    16
  • Joined

  • Last visited

  • Days Won

    1

Nefisto last won the day on October 28 2020

Nefisto had the most liked content!

Community Reputation

2 Neutral

About Nefisto

  • Rank
    Member

Recent Profile Visitors

The recent visitors block is disabled and is not being shown to other users.

  1. 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?
  2. 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
  3. 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:
  4. Hey Carlos, I spent this morning migrating to a new workspace, so the problem is solved. Anyway thanks for your attention
  5. This is what appear after a checkin with suggested setting
  6. No I'm not No, I can't. When I "right click -> checkin pending changes -> chekin", it open incoming changes tab with Update workspace disabled. It's the same thing that happens when I try via pending changes I'm a free user If u think that this can be hard to solve in anyway, let me know, and I'll create a new project and copy/paste things, because at moment I cannot make any push. Thanks for your attention
  7. Error dissapeared, but I only did things to determine where the error is coming from... "New workspace -> make a slight change -> checking it -> delete workspace -> remove new change set". But now, when I try to chekin something, instead of error this screen come up But I cannot update my workspace... What am I doing wrong?
  8. \o/ It's working now But I don't got what I was doing wrong, differences between your setup and mine is only your binding that is to "Repositories" and not my local repository specifically Anyway, thanks for help 😜
  9. Sorry for late. Attached I'm checkin changes I've created a new local workspace and chekins is working fine, but changes that I made in original workspace aren't pushed to server yet (because of error) logs.rar
  10. Yes, I'm Of course, already sent an invite Tried now, but same result
  11. I trying to integrate with jira issue tracker, followed the instructions from plastic docs and when I "Test connection" in "Preferences -> Issue trackers" it return successful. But when I try to create a new branch and choose "from task" the tittle error appear and I cannot see my issues. I'll attach some screenshots, if it's lacking information plz let me know
  12. That's what I was afraid of. But anyway thanks for help guys, I'll get used to change permissions and try to implement this in my workflow 😜
  13. My bad, I meant repository My bad again, I was referring to Github whenever I said git How I can achieve this? I try to find this in the dashboard, but I found only how to add ppl to my organization and in plastic, I only found how to change permission. Can u show me how to share only the repo? And another one, does I need to invite ppl to my organization to share repo? Will be amazing if I don't need to I've saw recommendations about this in your book, I'll certainly try to study a little more about it, I've never heard about it before. You're right, this is a good solution, now that u say an answer this question seems some kind of silly one 😒 haha It really helped, thanks a lot
×
×
  • Create New...