0

I am using TFS2012 express. I have a project which has two branches.These two branches have similar file and code. Actually one is release code(one which i gave to customers) and another is testing code. I always change code in testing code branch. So sometime i need to checkin this changes to both the branch. Also some changes i don't want to check-in to both and only to testing code branch. So how i can do it in tfs? Problem is how to checkin only certain changes to both branch and some changes to only one branch?

IT researcher
  • 3,274
  • 17
  • 79
  • 143
  • You can always check in the changes to testing branch. If you need certain changes in the release branch as well, you can use Merge command to do that. – Rachel Oct 22 '13 at 07:21
  • @Rachel Merge will merge all changes from one branch to another and it will make both branch same. But in my case i want to checkin only some changes to both the branch. Some change will be checkin to only one branch. – IT researcher Oct 22 '13 at 07:34
  • 1
    When you do Merge, you can choose "Selected change sets" instead of All changes. – Rachel Oct 22 '13 at 07:45
  • @Rachel Works fine. But there is one problem, when change are in adjacent lines . If change set 10 contains changes is in code let us say line number 100 and changeset 11 contain changes in line number 101. Then while merging only changeset 11 conflicts is shown.It shows those 100,101 line numbers.Now how can i select only line 101 to checkin which is in changeset 11. there is option to tick in merge tool.It selects both line not single line.Please help – IT researcher Oct 22 '13 at 10:55
  • 1
    The result panel at the bottom of merge tool is editable. So you can always choose/make the changes you like. – Rachel Oct 23 '13 at 06:09
  • @Rachel worked fine. I think you can post it answer so that that i can mark it as answer. – IT researcher Oct 24 '13 at 08:57

1 Answers1

1

You can always check in the changes to testing branch. If you need certain changes in the release branch as well, you can use Merge command to do that.

When you do Merge, you can choose "Selected change sets" instead of All changes. When resolving conflicts in mergetool, you can choose/make the changes you like in the result panel at the bottom which is editable.

Rachel
  • 1,372
  • 1
  • 8
  • 11