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. suggestion: add a cherry pick without link option / or allow delete of cherry pick links

    By epeleg,
    • 10 replies
    • 4.9k views

  2. Issue with pulling

    By Noxxid3,
    • 1 reply
    • 664 views

  3. Custom merge tool

    By Kai_N,
    • 1 reply
    • 654 views

  4. Auto-fill check-in comment on merge and cherry-pick

    By tikonen,
    • 2 replies
    • 1.5k views

  5. Subtractive merge parts of a changeset

    By Johan Ung,
    • 1 reply
    • 2k views

  6. CLI - find parent branch

    By Misieq,
    • 1 reply
    • 836 views

  7. Destructive automerge

    By redmond27,   
    • 1 reply
    • 1k views

  8. How do I merge good changes from a branch, and not unwanted ones?

    By ChrisD,   
    • 3 replies
    • 1.5k views

  9. Warning: This file has been changed in the workspace, out of Plastic SCM control.

    By davidoddgames,
    • 1 reply
    • 1.2k views

  10. Deleted branch and now all local files are gone?

    By ironbelly,
    • 8 replies
    • 2.1k views

  11. Branch Explorer not working - Unexpected Error

    By ironbelly,   
    • 1 reply
    • 2k views

  12. Advanced cherry pick

    By tony707,   
    • 4 replies
    • 2.9k views

  13. Empty Branches created on XLinks causing problems.

    By Murcho,   
    • 5 replies
    • 996 views

  14. Gitflow VS Task-Driven Development

    By diegohb,   
    • 2 replies
    • 1.3k views

  15. Can I update xlink content without submit?

    By mengke,   
    • 1 reply
    • 871 views

  16. Files to remain only in the branches

    By noti,
    • 1 reply
    • 564 views

  17. Cannot cherry pick/partially revert file adds and deletions?

    By Wolfram,
    • 7 replies
    • 2.5k views

  18. Is there a good workflow for concurrent, long-term branches?

    By Wolfram,
    • 1 reply
    • 713 views

  19. the merge is not currently available in the cloud server 1 2

    By defensezone@gmail.com,   
    • 33 replies
    • 3.9k views

  20. Error: Name has invalid chars

    By rthompson,
    • 3 replies
    • 1.3k views

  21. Merge-to doesn't work with active Xlink

    By tsvc,
    • 1 reply
    • 787 views

  22. Simultaneous modifications to x-linked Repo causes information loss?

    By wyattetal,   
    • 9 replies
    • 1.2k views

  23. How to work with "multi head" error during git sync?

    By mengke,   
    • 3 replies
    • 1.7k views

  24. Merge A into B before merging B into A

    By antoine.agthe,
    • 4 replies
    • 2.4k views

  25. Delete branch after merge

    By antoine.agthe,
    • 10 replies
    • 3.3k views
×
×
  • Create New...