Branching and merging

216 topics in this forum

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

   By dean, Friday at 04:50 AM
   • 1 reply
   • 11 views
   • 
   • psantosl
   • Friday at 09:12 AM

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

   By Mikael Kalms, November 19, 2020
   • 4 replies
   • 111 views
   • 
   • Mikael Kalms
   • December 16, 2020

3. Preventing locking across branches / forking

   By Wouter, August 29, 2019   

   • exclusive checkout
   • locks
   • (and 1 more)

     Tagged with:

     • exclusive checkout
     • locks
     • subbranch
   • 9 replies
   • 1,284 views
   • 
   • calbzam
   • December 9, 2020

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

   By DanielLG, December 7, 2020   

   • merge
   • checkin
   • 2 replies
   • 50 views
   • 
   • DanielLG
   • December 9, 2020

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

   By availlant, November 16, 2020   

   • connection error
   • remote
   • 1 reply
   • 29 views
   • 
   • Héber
   • November 16, 2020

6. issues identifying second HEAD in Plastic repo

   By Nick Antonelli, November 12, 2020   

   • head
   • sync replicaton
   • 2 replies
   • 38 views
   • 
   • Nick Antonelli
   • November 12, 2020

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

   By mjensen, October 16, 2020   

   • mergebots
   • 12 replies
   • 156 views
   • 
   • mjensen
   • October 29, 2020

8. Multiple heads after git sync

   By srs, August 14, 2016   

   • git
   • 3 replies
   • 1,403 views
   • 
   • calbzam
   • October 28, 2020

9. Drawing a merge line without merging

   By Anish, October 22, 2020
   • 3 replies
   • 47 views
   • 
   • calbzam
   • October 22, 2020

10. Ignoring specific line in specific file

    By mjensen, October 12, 2020   

    • merge
    • ignore
    • 3 replies
    • 63 views
    • 
    • calbzam
    • October 14, 2020

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

    By JEP, September 1, 2020
    • 4 replies
    • 95 views
    • 
    • Oyvind
    • September 25, 2020

12. Error merge

    By k119_55524, September 23, 2020
    • 2 replies
    • 72 views
    • 
    • k119_55524
    • September 23, 2020

13. Component based dev (XLinks?)

    By BinaryJared, August 21, 2020
    • 4 replies
    • 105 views
    • 
    • calbzam
    • September 2, 2020

14. Error with commiting due to pending merge from deleted branch

    By neroid, August 28, 2020   

    • commit
    • error
    • (and 1 more)

      Tagged with:

      • commit
      • error
      • merge
    • 0 replies
    • 54 views
    • 
    • neroid
    • August 28, 2020

15. Merging only specific files

    By iniside, August 12, 2020
    • 2 replies
    • 102 views
    • 
    • iniside
    • August 12, 2020

16. No conflicts but "Process All Merges" does not work

    By Geert Lowet, June 27, 2020
    • 2 replies
    • 125 views
    • 
    • Geert Lowet
    • July 1, 2020

17. Can't Checkin or Undo changes after merge

    By pali, May 22, 2020   

    • merge
    • checkin
    • 2 replies
    • 270 views
    • 
    • calbzam
    • May 22, 2020

18. Cherry pick resolve whole branch

    By rlewicki, May 20, 2020
    • 5 replies
    • 148 views
    • 
    • calbzam
    • May 22, 2020

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

    By Xarbrough, November 30, 2019   

    • cloud edition
    • 4 replies
    • 570 views
    • 
    • Xarbrough
    • December 3, 2019

20. Want a select for all button when resolving merges

    By Stephen Taylor, October 31, 2019
    • 5 replies
    • 175 views
    • 
    • calbzam
    • November 18, 2019

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

    By chud575, December 10, 2018
    • 7 replies
    • 4,959 views
    • 
    • calbzam
    • November 15, 2019

22. Restore Deleted Changeset

    By ScottP, September 26, 2019
    • 1 reply
    • 463 views
    • 
    • manu
    • September 27, 2019

23. Switching branches with changed items

    By Rhys, September 4, 2019   

    • change
    • branches
    • (and 1 more)

      Tagged with:

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

24. Directory Merge Fail

    By JarJarThomas, May 11, 2011
    • 4 replies
    • 1,658 views
    • 
    • JacobExperimental
    • September 4, 2019

25. Top level branch from top level branch

    By AaronV_NMR, August 15, 2019
    • 10 replies
    • 435 views
    • 
    • AaronV_NMR
    • August 19, 2019