Jump to content

Branching and merging

Plastic SCM Branching and Merging

243 topics in this forum

  1. Resolving an evil twin

    By crossmr,
    • 1 reply
    • 23 views

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

    By chud575,
    • 9 replies
    • 6.3k views

  3. Interactive staging of changed contents

    By ytoporovskyy,
    • 0 replies
    • 22 views

  4. Preventing locking across branches / forking

    By Wouter,   
    • 21 replies
    • 3.1k views

  5. How to split a merge into smaller changesets?

    By Upgrayeddedd,
    • 1 reply
    • 70 views

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

    By Xarbrough,   
    • 5 replies
    • 1.6k views

  7. issues identifying second HEAD in Plastic repo

    By Nick Antonelli,   
    • 6 replies
    • 642 views

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

    By Cezar,
    • 1 reply
    • 119 views

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

    By Nick D,
    • 3 replies
    • 94 views

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

    By AndyDB,
    • 1 reply
    • 144 views

  11. Merge bug leads to unopenable and irevertable scene

    By SweatyDev,   
    • 3 replies
    • 709 views

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

    By THRDStooge,
    • 1 reply
    • 148 views

  13. No Home icon on branch explorer

    By ChrisBQ,
    • 1 reply
    • 105 views

  14. Item loaded twice conflict

    By JakubH,   
    • 10 replies
    • 3.4k views

  15. Selectively rollback changes on files from Diff window

    By peetonn,
    • 1 reply
    • 112 views

  16. Cannot access a Branch due to server encryption

    By JoenTNT,   
    • 1 reply
    • 65 views

  17. 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
    • 195 views

  18. Deleting last changeset on Cloud

    By jill,
    • 1 reply
    • 365 views

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

    By LouisHughes_V360,
    • 3 replies
    • 165 views

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

    By Duardo,   
    • 2 replies
    • 293 views

  21. How to make two branches identical?

    By ioioio,
    • 3 replies
    • 305 views

  22. Merge without checkin from command line

    By David Cañadas,
    • 2 replies
    • 197 views

  23. Custom mergebot for mixed trunk/branch based development

    By David Cañadas,
    • 1 reply
    • 208 views

  24. Is it possible to enforce branch naming to follow a particular convention?

    By mdel,
    • 1 reply
    • 158 views

  25. Is it possiblie to undo 'Move changeset to a different branch'?

    By mdel,
    • 4 replies
    • 421 views
×
×
  • Create New...