I have two branch in git-tfs. one is master and other is QA, this branch is created from master previously. All the recent changes are in master. Now i want to get the changes from master to my QA branch. how to get that? I want to get done that from the browser.
Asked
Active
Viewed 2,098 times
1
-
What's the detail mean of the git-tfs in your above question? Are you talking about the `git-tfs` tool - - a two-way bridge between TFS and git? Or just mean the git source control in TFS? – PatrickLu-MSFT Sep 12 '17 at 08:42
-
@Patrick-MSFT it is git source control in TFS. – MarsRoverII Sep 14 '17 at 15:54
-
Then you could create a pull request to achieve the merge in the browser. – PatrickLu-MSFT Sep 14 '17 at 16:06
-
Hi MarsRoverll, any update on this, have you solved it? – PatrickLu-MSFT Sep 25 '17 at 02:11
-
@Patrick-MSFT, thanks my problem is solved. – MarsRoverII Sep 25 '17 at 06:51
2 Answers
1
If you are talking the git-tfs command tool, you could also manager merges with git-tfs.
If you want, for example, to merge the branch
b1in the trunktrunk, you need thatb1andtrunkto be entirely checked in Tfs. Once done, you could do the merge with git as a normal merge with 2 local git branches. Then you have to check this commit into Tfs with the commandrcheckinand a merge changeset will be created into Tfs.
More details please refer this tutorial git-tfs ,but it's not able to do this from the browser.
If you are just talking about the GIT source control in TFS, and want to get done that from the browser. The only way is creating a pull request. Detail step just follow this thread: Create a pull request
PatrickLu-MSFT
- 49,478
- 5
- 35
- 62
0
You will just have to synchronise the branch with the master and it will do, i.e in easier terms synchronisation of a branch means to merge the master into that branch. That's it!
Kushagra Saxena
- 671
- 5
- 17