Branching and merging

229 topics in this forum

1. Error replicating branch on sync process - Source branch has two heads

   By Duardo, September 19   

   • sync replicaton
   • branch
   • (and 1 more)

     Tagged with:

     • sync replicaton
     • branch
     • head
   • 2 replies
   • 74 views
   • 
   • calbzam
   • September 20

2. How to make two branches identical?

   By ioioio, August 10
   • 3 replies
   • 140 views
   • 
   • calbzam
   • August 11

3. Merge without checkin from command line

   By David Cañadas, July 27
   • 2 replies
   • 96 views
   • 
   • David Cañadas
   • July 29

4. Custom mergebot for mixed trunk/branch based development

   By David Cañadas, July 15
   • 1 reply
   • 112 views
   • 
   • calbzam
   • July 20

5. Is it possible to enforce branch naming to follow a particular convention?

   By mdel, July 16
   • 1 reply
   • 82 views
   • 
   • calbzam
   • July 19

6. Is it possiblie to undo 'Move changeset to a different branch'?

   By mdel, July 14
   • 4 replies
   • 100 views
   • 
   • mdel
   • July 16

7. How can I delete a branch after it's been merged?

   By Jose I, June 21
   • 3 replies
   • 91 views
   • 
   • Jose I
   • June 22

8. Preventing locking across branches / forking

   By Wouter, August 29, 2019   

   • exclusive checkout
   • locks
   • (and 1 more)

     Tagged with:

     • exclusive checkout
     • locks
     • subbranch
   • 16 replies
   • 2.1k views
   • 
   • nahuelarjonadev
   • June 17

9. Command Line to "Override All" Permissions

   By rodgeralley, June 14
   • 7 replies
   • 115 views
   • 
   • calbzam
   • June 15

10. please help me.......

    By hovi, May 28
    • 1 reply
    • 86 views
    • 
    • calbzam
    • May 31

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

    By Mikael Kalms, November 19, 2020
    • 10 replies
    • 676 views
    • 
    • calbzam
    • May 26

12. [SOLVED]Stuck in a branch. I cant switch. Warning error : "This file is detected as binary. No diffs are calculated; the file metadata is displayed instead...."

    By sskenth, May 17
    • 1 reply
    • 90 views
    • 
    • sskenth
    • May 17

13. Merging after Subtractive Merge deletes files, instead of ignoring addition

    By Kike, April 20
    • 0 replies
    • 110 views
    • 
    • Kike
    • April 20

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

    By Jonas Hultén, April 14   

    • checkin
    • merge
    • (and 1 more)

      Tagged with:

      • checkin
      • merge
      • binary
    • 4 replies
    • 127 views
    • 
    • Jonas Hultén
    • April 16

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

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

16. Is it possible to remove a specific commit?

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

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

    By dean, January 15
    • 2 replies
    • 133 views
    • 
    • dean
    • January 18

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

    By DanielLG, December 7, 2020   

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

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

    By availlant, November 16, 2020   

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

20. issues identifying second HEAD in Plastic repo

    By Nick Antonelli, November 12, 2020   

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

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

    By mjensen, October 16, 2020   

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

22. Multiple heads after git sync

    By srs, August 14, 2016   

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

23. Drawing a merge line without merging

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

24. Ignoring specific line in specific file

    By mjensen, October 12, 2020   

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

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

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