Branching and merging

250 topics in this forum

1. Cannot checkin because merge in progress... again!

   By notken, April 19, 2012   

   • merge
   • checkin
   • 13 replies
   • 14.2k views
   • 
   • calbzam
   • March 15, 2019

2. Unable to complete merge

   By kevinj, May 1, 2013   

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

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

   By chud575, December 10, 2018
   • 9 replies
   • 8k views
   • 
   • Kaleidocore
   • September 23, 2022

4. Filtering/Hidding branches

   By Guest, January 14, 2008
   • 3 replies
   • 7.6k views
   • 
   • tsamstag
   • April 8, 2010

5. Merging scenes

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

6. Evil twin conflict resolution

   By JakubH, October 31, 2012   

   • evil twin
   • conflict
   • (and 1 more)

     Tagged with:

     • evil twin
     • conflict
     • merge
   • 6 replies
   • 6.9k views
   • 
   • manu
   • November 5, 2012

7. 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

8. Merge selected files from one branch to another

   By ryexley, October 22, 2012
   • 6 replies
   • 6.2k views
   • 
   • Pete
   • October 21, 2014

9. what should I do with this error message? (binary merge issue)

   By epeleg, November 23, 2011   

   • excel
   • binary
   • (and 2 more)

     Tagged with:

     • excel
     • binary
     • merge
     • error
   • 2 replies
   • 5.6k views
   • 
   • epeleg
   • November 24, 2011

10. Trouble with xlink to multiple repositories

    By Corey.Caldwell, January 23, 2012   

    • xlink
    • 9 replies
    • 5.3k views
    • 
    • manu
    • February 1, 2012

11. Preventing locking across branches / forking

    By Wouter, August 29, 2019   

    • exclusive checkout
    • locks
    • (and 1 more)

      Tagged with:

      • exclusive checkout
      • locks
      • subbranch
    • 21 replies
    • 5.2k views
    • 
    • Patrice Beauvais
    • September 16, 2022

12. Updating a xlink data

    By cidico, December 17, 2011
    • 21 replies
    • 4.8k views
    • 
    • psantosl
    • December 31, 2011

13. suggestion: add a cherry pick without link option / or allow delete of cherry pick links

    By epeleg, June 20, 2012
    • 10 replies
    • 4.8k views
    • 
    • calbzam
    • January 3, 2018

14. Switching branches with changed items

    By Rhys, September 4, 2019   

    • change
    • branches
    • (and 1 more)

      Tagged with:

      • change
      • branches
      • pending changes
    • 3 replies
    • 4.5k views
    • 
    • calbzam
    • September 5, 2019

15. Resuming a merge

    By LoganBarnettASU, June 28, 2012   

    • merge
    • resume
    • 6 replies
    • 4.5k views
    • 
    • Soho
    • July 2, 2012

16. Branches on Plastic SCM

    By Guest, January 1, 2008
    • 17 replies
    • 4.4k views
    • 
    • Guest
    • March 4, 2008

17. Rebase

    By curlruksun, January 18, 2014   

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

18. Item loaded twice conflict

    By JakubH, February 26, 2014   

    • merge
    • conflict
    • 12 replies
    • 4.1k views
    • 
    • calbzam
    • July 6, 2023

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

    By defensezone@gmail.com, November 23, 2015   

    • merge
    • cloud
    • (and 2 more)

      Tagged with:

      • merge
      • cloud
      • error
      • server
    • 33 replies
    • 3.8k views
    • 
    • manu
    • November 17, 2016

20. Cherry Pick merge - What & How?

    By EdDev, February 7, 2013
    • 5 replies
    • 3.8k views
    • 
    • manu
    • February 7, 2013

21. Merge bug leads to unopenable and irevertable scene

    By SweatyDev, May 12, 2022   

    • bug
    • merge
    • (and 2 more)

      Tagged with:

      • bug
      • merge
      • scene
      • client.conf
    • 3 replies
    • 3.7k views
    • 
    • mech_alina
    • June 12, 2022

22. Contributors = "None" ???

    By CG, September 4, 2009
    • 1 reply
    • 3.6k views
    • 
    • Borja
    • September 23, 2009

23. List of modified and new files in branch

    By jrcastell, February 22, 2010
    • 3 replies
    • 3.5k views
    • 
    • Guest
    • November 26, 2010

24. just got "an error occurred processing your request" when creating a new branch

    By epeleg, November 13, 2012
    • 5 replies
    • 3.4k views
    • 
    • manu
    • November 22, 2012

25. Multiple heads after git sync

    By srs, August 14, 2016   

    • git
    • 3 replies
    • 3.3k views
    • 
    • calbzam
    • October 28, 2020