Jump to content

Search the Community

Showing results for tags 'merge'.

  • Search By Tags

    Type tags separated by commas.
  • Search By Author

Content Type


Forums

  • Plastic SCM
    • General
    • Installation and configuration
    • Unity 3D
    • Plastic SCM on Mac
    • Plastic SCM on Linux
    • Gluon
    • Git interop
    • Integrations
    • Community Edition
    • Branching and merging
    • Announcements
  • Plastic SCM 4.0 Beta (Closed)
  • Plastic Cloud
    • General
    • Configuration
  • SemanticMerge
    • General
    • License
    • SCM's configuration
    • Share your experience!
    • External Parsers
  • GitJungle
  • Method History for Subversion

Find results in...

Find results that contain...


Date Created

  • Start

    End


Last Updated

  • Start

    End


Filter by number of...

Joined

  • Start

    End


Group


AIM


MSN


Website URL


ICQ


Yahoo


Jabber


Skype


Location


Interests

  1. Some of us can generate large amounts of data changes in a day. When the changes should be checked in it takes so long to upload them that someone else is likely to have made a checkin and the upload is dropped. This results in a manual merge step, even if no conflict exists, and then the whole thing repeats since the data has to be uploaded again. This isn't working well. I see a couple of potential solutions from the client's perspective. Upload will complete regardless of other checkins but it will stay in a temporary head until merged with the checkin branch. Checkin will succe
  2. So i'm started use plastic afew months, I never get any problem, but since yesterday I can't make chekin in my changes, when I try, I recieve an error message who started apear suddently. Also, I'm the owner of organization and repository, how I can't have permission? what's going on?
  3. Is there a way to ignore a ignore specific line in specific file? Otherwise is a way to say whichever version of the file is fine for merging? In our Unity project we set the project version to match what cs we are working on, which gives a lot of merge conflicts... If there is no built in feature to deal with a known recurring conflict, is there any good workaround? We are thinking of setting up a pre-merge trigger that sets the value to 1 or something like that, but would much rather use a existing feature instead.
  4. When im trying to commit im getting an error that doesnt allow me to do so, its possibly due to the fact i had an ongoing pending cherry pick from a branch which i deleted, but i cant find the cherry pick window or anything to fix this. Thanks for your time in advance.
  5. I merged from main branch to task branch, did multiple changes and then tried to merge back to main branch. However if I try to Checkin, I get following error: "Cannot perform the checkin operation. All merge changes must be checked in together to ensure that the merge traceability is correctly stored. Please repeat the operation including all merge changes." If I try to Undo changes, I get following error: "Cannot perform the undo operation. All merge changes must be undone together. Please repeat the operation including all or none of its changes." Currently, I am unable to c
  6. If some reverts a file it only shows the CL number in bold that it's been reverted to in the file history. This is confusing and it should dhow the CL number as the operation does have a CL which you can see in the branch view. This makes it difficult to look through the history and see someone has done a reversion. It is also not entirely obvious that the reversion is going to stick when merged in from another branch. The same can be said for a subtractive merge. We have just had a case where so changes were being reverted when merging from main and we couldn't understand why. It tu
  7. Hi everyone! I have been using plastic for 2 weeks without any problem. But, the last time I tried to verify some changes in a project, an error message appeared and the operation was canceled. I have tried all kinds of things, but I have no results. Any help will be appreciated! Greetings, Juan.
  8. Hi there. I've seen quite a few reports of this similar message on the forum: "Checkin operation cannot be started because there is a merge in progress. Finish it before checkin the changes. In progress merge. Merge from cset xxx." But I still don't know what to do about it, and my colleagues bang their heads into the same problem. We can't check in but who knows how to do this merge? Sometimes while we can't do it in Visual Studio it works in the client app, but sometimes that doesn't work either. The only cast-iron solution seems to be to undo everything losing all changes, then update wor
  9. We're evaluating Plastic using the regular client (not gluon) and there's one aspect about it that seems to work against our normal workflow (as opposed to Perforce which we're used to). At any one time I'll have 10 files checked out. I will undo about 5, check in 2, and keep the other 3 untouched. The ones I want untouched, I might have checked out for weeks (or months) through multiple checkins, and eventually check in or sometimes undo. In Plastic this workflow is problematic. I can't just check in the 2/10 files and merge them into the main branch on their own. It either wants
  10. Hi, we are looking for a way to list all changesets of a certain branch that have not been integrated into another branch. Our szenario is a beta deployment branch. There are a lot of changes directly made on that branch that are meant to be integrated into /main again. Other changes should not be integrated (workarounds etc.). We created a branch from /main that is used for this integration. The changes that have to be integrated are cherry picked from the beta deployment branch. We want to have a list of all changesets that are not merged in any way (merge or cp) from the beta depl
  11. I have a question about merge and conflict with XLink. I would like to explain why after merge conflict exists. The problem/description: I have two repositories “TestPB” and “TestPB1”. The “TestPB” repository has XLink for the “TestPB1”. I have two branches to which the same change is added. Next updates the XLinki in the “TestPB” repository and merges like this: In this case, after the merge there is a conflict for XLink. I would expect that there will be no conflict because start and end changeset are the same, additionally the ch
  12. We have one serious issue here. I just find out that if somebody add a new file in one branch, cherry pick that changeset to a child branch and after some time he/she wants to merge from the second branch to the first one, the file cannot be merged! I knew already about an evil twin conflict and the inability of Plastic to solve this type of conflict by a merge. I thought that a workaround to this is to make sure to check-in a file in one branch only and cherry pick it to other branches if needed. Now, I see it is not always a solution. In the described case the problem is even hidden, bec
  13. In our project we have a large csv file that contains 572 rows with 13 columns for each row, currently sitting at about 7500 cells. This file is saved in UTF16 format as a tabbed separated document (despite the csv extension). I recently merged from a branch in which there were changes in both the source and the destination. Plastic automatically processed the conflicts, since then however I have been unable to diff the file in any subsequent changesets. The file itself only had three lines altered. I've reverted to a version since before the merge (as the automatic merge, while succ
  14. When performing a merge, the display should show the result of the merge in before you actually check in the changes. However, the display is showing that the new change set created from the merge will be before the last change set on the branch into which you are merging. This is shown in the attached image. (NOTE: The pixelly nonsense where the branch name should be is NOT a part of the bug. The screen shot is from work where I have a NDA, so I blurred the text to be on the safe side.)
  15. Twice since I started my project has changeset been unknowingly set to "0" while in the middle of working. Recently this caused me to lose all of my local changes. When I go to checkin, my changeset appears to be set to zero in my branch explorer, but no files on my computer support this. All files are up to date locally. When I go to checkin it only shows the local files to checkin that are different than my last changeset (22), not the changest 0 that is claims to be on. The first time this happened I merged to a new branch, then synced to the most recent change and then merged my branc
  16. One of our users has been working in a branch, and has a few changes checked in in various changesets that we want to do not want to bring into the main branch when we merge his branch in. In short. I want to merge most of his changes into the main branch, but some of them I do not want. I've tried all sorts of things, but Merge wants me to Merge everything. When I create a new changeset in the subject branch I can't seem to easily roll back any changes. What is the correct way to do this in Plastic?
  17. Has anyone tried to use Unity's YAML merge tool with older Unity projects? 4.72 specifically. I don't see it in the Unity folder in Unity 4.72, but I could direct it to the Unity 2017 folder.
  18. Hi, I have big project where on different branch I was making changes in directories (changing names, moving them) (I had to apply some local changes to be able to checkin) I was merging from main branch to my without any problems, but today I wanted to merge my branch to main and check if everything is right but I've got this error when tried to start merge: "Some Merge Operations Cannot Be Applied" I including screenshot, I don't giving me any other info, just 'can't be applied", I have to update plastic to newest version because now I have client 5.4.16.803 but don't know now
  19. Hi, has anybody had any luck getting unity smart merge to work? I've ran some tests to try to get a couple of simple scene changes merged properly but it doesn't seem to work. This is the error I get: my settings are defined as so in preferences->mergeTools: External Merge Tool: C:\Program Files\Unity\Editor\Data\Tools\UnityYAMLMerge.exe merge -p "@basefile" "@sourcefile" "@destinationfile" "@output" this is with it looking for the pattern .unity Is there something obvious that I'm missing? That command comes straight from the unity smart merge manual page so I'm
  20. Hi, We were wondering if you eventually plan to add a feature allowing to cherry pick a changeset from any branch to any other branch ? We are already using the Advanced Merge > Merge from this changeset to, which is super convenient. The same feature for cherry picking would be nice too and would save a lot of time when maintaining multiple branches with the same hotfix. Thank you Anthony
  21. Hello! A couple of years ago you introduced a detailed merge history in diff view. Previously the diff view was only a plain list divided only into the Changed, Added, Deleted and Moved sections. After then the diff view started displaying files under extra sub-nodes which indicated consecutive merges a file underwent. Lets call this 'the detailed merge history'. I also remember that the detailed merge history had to be switched on at server side using command line, but I can't find the command for it. If I remember correctly, detailed merge history was available for all branches cre
  22. Hi, Using GTK client 5.4.16.688 (linux) I see that kdiff3 works for merge operations. However when setting P4Merge as a custom tool the latter doesn't get displayed. I only get a list of files that can be modified manually using diff/merge rules listed in the context menu. I have validated that this command line works with test files : /opt/p4merge/bin/p4merge -nl "@sourcefile" -nb "@basesymbolic" -nr "@destinationfile" "@sourcefile" "@basefile" "@destinationfile" "@output" Would someone have an explanation ? P4Merge can be downloaded for free from : http://www.perforce.com
  23. Hello, I'm trying to use the "before checkin" trigger to validate the checkin source is a merge and not direct checkin to the main branch. I'm trying to read the "PLASTIC_PENDING_MERGE_LINKS" (see reference : https://www.plasticscm.com/documentation/triggers/plastic-scm-version-control-triggers-guide.shtml#Checkin) My problem is that the env. variable "PLASTIC_PENDING_MERGE_LINKS" returns empty value when the trigger is fired. I've noticed that when I do merge operation, new files are created in my workspace : (1) plastic.merges, (2) plastic.mergeschanges. The problem is that I u
  24. Hi! I'm having a very strange problem. A co-worker performed a merge operation on the "git side of the force" and on his merge he's not doing any delete: After I performed my gitsync, Plastic is identifying a delete operation: These operations never happened. What do I do? I can't "undo" the delete operation on a merge. I don't want to "undo" all his work. Please, help! Thanks!
×
×
  • Create New...