Stack Overflow
Stack Overflow

Questions tagged [baseless-merge]

6 questions
16
votes
1 answer

Should I avoid baseless merges in TFS?

Simple question perhaps, but one I'm having a hard time finding the answer to. I often work at a client that uses TFS as source control and they completely avoid using the baseless merge feature of TFS source control In part because in the past it…
Robba
  • 7,684
  • 12
  • 48
  • 76
6
votes
2 answers

Reparenting a child branch to its grand-parent

I have the following branch structure: - Main |- Release 1 |- Release 1.1 |- Release 2 I want to reparent Release 1.1 to Main so it looks like - Main |- Release 1 |- Release 1.1 |- Release 2 The reason I want to do this is…
user1601700
  • 61
  • 1
  • 2
4
votes
3 answers

Baseless merge for multiple non-consecutive changesets

I'm issuing the following command to TFS: >tf merge /baseless c:\ws\source c:\ws\target /recursive /version:C100~C100 But I have a large list of changesets that need to be merged. Is there a shortcut for this, or some way to specify a list, for…
Paul Michaels
  • 16,185
  • 43
  • 146
  • 269
3
votes
1 answer

TFS baseless merge contains unchanged files in changset

I am doing a baseless merge between a branch B and C, since we do not want to go to trunk and down. B and C are latest with all trunk changes. Before I did a baseless merge in Visual Studio 2013, I did compare of the two branches, It said 6220 files…
Gopal SA
  • 949
  • 2
  • 17
  • 36
1
vote
1 answer

TFS - baseless merge and merging out of order

We have a tricky situation with our branches on TFS 2012 and now we are not exactly sure what will be the result of our actions. The problematic branch structure is as follows: /B----2------- / A -------1----------- \ …
JustAMartin
  • 13,165
  • 18
  • 99
  • 183
0
votes
1 answer

Multiple dev branches avoiding baseless merges

I'm looking for the correct branching and merging strategy for the situation I'm currently in. A few weeks ago I created a new Dev branch from Main for version 1.6 of an application. This version is now being tested and will go live in the coming…
MeanGreen
  • 3,098
  • 5
  • 37
  • 63