Jump to content
Plastic SCM forums are now in Unity. Click here to open the new forum ×

Branching and merging

Plastic SCM Branching and Merging

250 topics in this forum

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

    By LouisHughes_V360,
    • 3 replies
    • 237 views

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

    By Duardo,   
    • 2 replies
    • 436 views

  3. How to make two branches identical?

    By ioioio,
    • 3 replies
    • 468 views

  4. Merge without checkin from command line

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

  5. Custom mergebot for mixed trunk/branch based development

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

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

    By mdel,
    • 1 reply
    • 189 views

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

    By mdel,
    • 4 replies
    • 641 views

  8. How can I delete a branch after it's been merged?

    By Jose I,
    • 3 replies
    • 1.1k views

  9. Command Line to "Override All" Permissions

    By rodgeralley,
    • 7 replies
    • 510 views

  10. please help me.......

    By hovi,
    • 1 reply
    • 256 views

  11. Merging in an xlink change will not automatically update the xlinked folder contents

    By Mikael Kalms,
    • 10 replies
    • 1.2k views

  12. [SOLVED]Stuck in a branch. I cant switch. Warning error : "This file is detected as binary. No diffs are calculated; the file metadata is displayed instead...."

    By sskenth,
    • 1 reply
    • 272 views

  13. Merging after Subtractive Merge deletes files, instead of ignoring addition

    By Kike,
    • 0 replies
    • 213 views

  14. Checkin fails if other checkins happen during upload - again and again

    By Jonas Hultén,   
    • 4 replies
    • 279 views

  15. Is it possible to remove a specific commit?

    By Elamhut,
    • 1 reply
    • 776 views

  16. GUI lets you use space in branch name, but command line apparently does not.

    By dean,
    • 2 replies
    • 296 views

  17. Merge cannot be done because some local changes cannot be processed

    By DanielLG,   
    • 2 replies
    • 1.9k views

  18. An existing connection must have been closed by the remote host

    By availlant,   
    • 1 reply
    • 588 views

  19. Trunkbot with teamcity seems to build from main without changes.

    By mjensen,   
    • 12 replies
    • 598 views

  20. Multiple heads after git sync

    By srs,   
    • 3 replies
    • 2.8k views

  21. Drawing a merge line without merging

    By Anish,
    • 3 replies
    • 378 views

  22. Ignoring specific line in specific file

    By mjensen,   
    • 3 replies
    • 363 views

  23. Mergetool says "the buttons above", but what does that mean?

    By JEP,
    • 4 replies
    • 304 views

  24. Error merge

    By k119_55524,
    • 2 replies
    • 320 views

  25. Component based dev (XLinks?)

    By BinaryJared,
    • 4 replies
    • 308 views
×
×
  • Create New...