Branching and merging

218 topics in this forum

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

   By Jonas Hultén, Wednesday at 04:40 AM   

   • checkin
   • merge
   • (and 1 more)

     Tagged with:

     • checkin
     • merge
     • binary
   • 4 replies
   • 20 views
   • 
   • Jonas Hultén
   • 2 hours ago

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

   By chud575, December 10, 2018
   • 8 replies
   • 5.2k views
   • 
   • JEP
   • April 6

3. Preventing locking across branches / forking

   By Wouter, August 29, 2019   

   • exclusive checkout
   • locks
   • (and 1 more)

     Tagged with:

     • exclusive checkout
     • locks
     • subbranch
   • 13 replies
   • 1.5k views
   • 
   • David Cañadas
   • April 6

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

   By Mikael Kalms, November 19, 2020
   • 8 replies
   • 379 views
   • 
   • calbzam
   • March 22

5. Is it possible to remove a specific commit?

   By Elamhut, February 11
   • 1 reply
   • 101 views
   • 
   • calbzam
   • February 11

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

   By dean, January 14
   • 2 replies
   • 75 views
   • 
   • dean
   • January 17

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

   By DanielLG, December 6, 2020   

   • merge
   • checkin
   • 2 replies
   • 146 views
   • 
   • DanielLG
   • December 8, 2020

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

   By availlant, November 16, 2020   

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

9. issues identifying second HEAD in Plastic repo

   By Nick Antonelli, November 12, 2020   

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

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

    By mjensen, October 16, 2020   

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

11. Multiple heads after git sync

    By srs, August 13, 2016   

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

12. Drawing a merge line without merging

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

13. Ignoring specific line in specific file

    By mjensen, October 12, 2020   

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

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

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

15. Error merge

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

16. Component based dev (XLinks?)

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

17. 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
    • 93 views
    • 
    • neroid
    • August 28, 2020

18. Merging only specific files

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

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

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

20. Can't Checkin or Undo changes after merge

    By pali, May 22, 2020   

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

21. Cherry pick resolve whole branch

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

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

    By Xarbrough, November 30, 2019   

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

23. Want a select for all button when resolving merges

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

24. Restore Deleted Changeset

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

25. Switching branches with changed items

    By Rhys, September 4, 2019   

    • change
    • branches
    • (and 1 more)

      Tagged with:

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