Jump to content

Branching and merging

Plastic SCM Branching and Merging

248 topics in this forum

  1. Xlinks: Disable branch auto expansion

    By Acren,
    • 4 replies
    • 139 views

  2. 884 pending changes I didn't do, can't undo, commit, shelf, nor change branch.

    By San Jacobs,
    • 0 replies
    • 70 views

  3. Big bad merge and local uncommited work became one. How do I rescue my changes?

    By San Jacobs,
    • 1 reply
    • 83 views

  4. Interactive staging of changed contents

    By ytoporovskyy,
    • 5 replies
    • 173 views

  5. Suddenly all the changeset are missing from all my repositories ?

    By Nasir,
    • 0 replies
    • 40 views

  6. A common ancestor could not be found

    By Erich,
    • 1 reply
    • 542 views

  7. Resolving an evil twin

    By crossmr,
    • 1 reply
    • 74 views

  8. Can't get rid of a pending merge link

    By chud575,
    • 9 replies
    • 6.8k views

  9. Preventing locking across branches / forking

    By Wouter,   
    • 21 replies
    • 3.4k views

  10. How to split a merge into smaller changesets?

    By Upgrayeddedd,
    • 1 reply
    • 125 views

  11. How to undo multiple changesets on main branch after mistakes?

    By Xarbrough,   
    • 5 replies
    • 1.8k views

  12. issues identifying second HEAD in Plastic repo

    By Nick Antonelli,   
    • 6 replies
    • 771 views

  13. Can't add an entry with the same name.

    By Cezar,
    • 1 reply
    • 362 views

  14. What exactly is the "--noninteractiveresolution" option doing in cm merge

    By Nick D,
    • 3 replies
    • 150 views

  15. Single Branch - Abandon multiple consecutive bad changesets and reset/restart from last good changeset

    By AndyDB,
    • 1 reply
    • 200 views

  16. Merge bug leads to unopenable and irevertable scene

    By SweatyDev,   
    • 3 replies
    • 1.6k views

  17. Selector can't locate a revision for the item ***

    By THRDStooge,
    • 1 reply
    • 259 views

  18. No Home icon on branch explorer

    By ChrisBQ,
    • 1 reply
    • 159 views

  19. Item loaded twice conflict

    By JakubH,   
    • 10 replies
    • 3.5k views

  20. Selectively rollback changes on files from Diff window

    By peetonn,
    • 1 reply
    • 185 views

  21. Cannot access a Branch due to server encryption

    By JoenTNT,   
    • 1 reply
    • 99 views

  22. Plastic does not let me delete a changeset, error " Deleting a changeset is not allowed on a repo that is on sync with git"

    By sanchitgng,
    • 1 reply
    • 311 views

  23. Deleting last changeset on Cloud

    By jill,
    • 1 reply
    • 600 views

  24. Trying to merge (or Cherry Pick) from branch is trying to bring over everythign in branch.

    By LouisHughes_V360,
    • 3 replies
    • 227 views

  25. Error replicating branch on sync process - Source branch has two heads

    By Duardo,   
    • 2 replies
    • 386 views
×
×
  • Create New...