Branching and merging

250 topics in this forum

1. Merging scenes

   By badescuga, June 11, 2014
   • 4 replies
   • 7.5k views
   • 
   • PolishRenegade
   • July 4, 2014

2. How to implement automatic workspace Check-out for all branches?

   By PolishRenegade, March 24, 2014
   • 7 replies
   • 1.9k views
   • 
   • manu
   • June 2, 2014

3. How? Promote newest offshoot branch as main? with or without Merge and how?

   By crashnburn, May 20, 2014   

   • worddocument
   • promote
   • (and 3 more)

     Tagged with:

     • worddocument
     • promote
     • overwrite
     • cherry
     • pick
   • 6 replies
   • 1.2k views
   • 
   • manu
   • May 30, 2014

4. XLink updated in branch - merge impossible ?

   By PeterThierolf, May 5, 2014
   • 4 replies
   • 2.2k views
   • 
   • PeterThierolf
   • May 13, 2014

5. Replication data is corrupted

   By ljp, March 18, 2014
   • 9 replies
   • 1.3k views
   • 
   • ljp
   • March 31, 2014

6. Protecting the main branch from accidental check-ins

   By marioo, August 23, 2013   

   • checkin
   • permissions
   • 6 replies
   • 2.5k views
   • 
   • SWSBB
   • March 10, 2014

7. Switch to end of branch identified by label in CLI

   By WDNichols, January 8, 2014   

   • CLI
   • switch
   • (and 1 more)

     Tagged with:

     • CLI
     • switch
     • label
   • 6 replies
   • 1.5k views
   • 
   • WDNichols
   • January 24, 2014

8. Rebase

   By curlruksun, January 18, 2014   

   • rebase
   • 4 replies
   • 4.2k views
   • 
   • curlruksun
   • January 22, 2014

9. Looking for "Advanced Merge" > "Merge this branch to..."

   By carpediemevive, January 7, 2014
   • 2 replies
   • 934 views
   • 
   • carpediemevive
   • January 10, 2014

10. AssertNull has found a null object error when trying to process merge

    By chun, December 16, 2013   

    • merge assertnull
    • 3 replies
    • 1.4k views
    • 
    • manu
    • December 18, 2013

11. Suggestions/Ideas for dealing with custom/one time use programming...

    By BDS_2006, December 6, 2013
    • 1 reply
    • 1.4k views
    • 
    • manu
    • December 10, 2013

12. Unable to complete merge

    By kevinj, May 1, 2013   

    • merge
    • 21 replies
    • 10.4k views
    • 
    • manu
    • November 15, 2013

13. moving a changeset between branches (feature request/Question)

    By epeleg, December 6, 2011   

    • brach
    • changeset
    • (and 1 more)

      Tagged with:

      • brach
      • changeset
      • move
    • 9 replies
    • 6.7k views
    • 
    • StevenTCramer@gmail.com
    • October 15, 2013

14. Check-in error after deleting change set

    By WDNichols, October 10, 2013   

    • shelve
    • merge
    • (and 2 more)

      Tagged with:

      • shelve
      • merge
      • delete
      • subtractive
    • 1 reply
    • 2.3k views
    • 
    • calbzam
    • October 11, 2013

15. Swapping main and child branch

    By WDNichols, August 26, 2013   

    • main
    • swap
    • 4 replies
    • 1.7k views
    • 
    • manu
    • September 6, 2013

16. Can I get branch name list which is not merged to main?

    By ydkim, August 16, 2013
    • 1 reply
    • 1.7k views
    • 
    • manu
    • August 16, 2013

17. Unable to merge due to directory conflict.

    By EdDev, February 27, 2013   

    • directory conflict
    • 3 replies
    • 1.8k views
    • 
    • manu
    • May 9, 2013

18. Merge file problem

    By db-esm, April 22, 2013   

    • Merge
    • check in
    • 4 replies
    • 2k views
    • 
    • db-esm
    • April 26, 2013

19. reapplying a substracted merge

    By jmranger, April 24, 2013
    • 2 replies
    • 1.9k views
    • 
    • jmranger
    • April 25, 2013

20. plastic scm 4.1.10.419 crashing on checking in on Ubuntu

    By ankit, April 16, 2013   

    • checkin crash
    • 9 replies
    • 1.3k views
    • 
    • calbzam
    • April 24, 2013

21. Automatic merge losing client side changes

    By burley1ASU, May 29, 2012
    • 23 replies
    • 2.8k views
    • 
    • JakubH
    • April 11, 2013

22. Unable to replicate

    By ducman, March 19, 2013
    • 1 reply
    • 930 views
    • 
    • calbzam
    • March 20, 2013

23. Issue starting a brand new Workspace/Repository off a Remote Branch

    By Xorcist, March 5, 2013
    • 3 replies
    • 886 views
    • 
    • manu
    • March 6, 2013

24. The need for issue tracker

    By Shacharpr, February 22, 2013   

    • JIRA
    • branch per task
    • (and 1 more)

      Tagged with:

      • JIRA
      • branch per task
      • HPQC
    • 1 reply
    • 1.3k views
    • 
    • calbzam
    • February 22, 2013

25. Merge VS Promote

    By rtaylor, January 7, 2011
    • 4 replies
    • 2.7k views
    • 
    • crashnburn
    • February 19, 2013