The files only where there's a conflict ? or will it take care of the files where "merge" is not resulting into a "conflict (i.e. I know that during conflict resolution, I can select the option which says: "Overwrite target branch data file with source branch" (which is a kind of me doing the replace/selecting "replace" operation on that file). Now, if Today I do the merge from Main -to-> 1.2.3, will 1.2.3 contain the exact and same number of files that Main has today -or will it ignore / not complete the merge in a "Replace" fashion (my main goal is to "replace"Ĥ. Is there any "option" in "tf merge" command which performs/tells the "merge" command to "replace" target/destination branch with the source branch? We stopped doing development on "1.2.3" branch and continued our live/current development changes in "Main" branch.Ģ. Process will do the merge automatically, where I assume IT SHOULD take care of making "file1" in 1.2.3 exactly similar to what "file1" is in Main. if file1 in Main has changes to line 50 to 100, and file1 in 1.2.3 branch has changes to 200 to 250 lines then, in that case "merge" Only where there's a conflict ? or will it take care of the files where "merge" is not resulting into a "conflict (i.e. Now, if Today I do the merge from Main -to-> 1.2.3, will 1.2.3 contain the exact and same number of files that Main has today -or will it ignore / not complete the merge in a "Replace" fashion (my main goal is to "replace"ġ.2.3 with/from Main branch's source code data) ?Ĥ. I know that during conflict resolution, I can select the option which says: "Overwrite target branch data file with source branch" (which is a kind of me doing the replace/selecting "replace" operation on that file). Side by side, on Main branch (which is the parent of 1.2.3), we made changes i.e. Now later for 1 month lets say, we deleted 1000 files from 1.2.3 and made changes to other 2000 files on 1.2.3. Lets assume at the time of 1.2.3 branch creation, Main branch had "10,000" files in the source control which means, 1.2.3 dev branch got the same number ofįiles (10,000) initially. ![]() ![]() Is there any "option" in "tf merge" command which performs/tells the "merge" command to "replace" target/destination branch with the source branch?ģ. What command should I use to perform this merge operation?Ģ. Now, I have a request to "Merge/Replace" 1.2.3 branch with the latest state of "Main" branch.ġ. We stopped doing development on "1.2.3" branch and continued our live/current development changes in "Main" branch. I created a development branch: "1.2.3" (sometime back in March 2010 from "Main" branch as its parent).
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |