create branch from project in the trunk … · Web viewlets create new project in visual studio...
Transcript of create branch from project in the trunk … · Web viewlets create new project in visual studio...
![Page 1: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/1.jpg)
Index :
create branch from project in the trunk 1
How to merge the branch into the trunk 11
How to merge from trunk to branch 11
how to handle conflicts 29
create branch from project in the trunkthis the current structure folders
![Page 2: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/2.jpg)
lets create new project in visual studio in trunk
![Page 3: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/3.jpg)
lets add new file and call him trunk – no reason
let's add all files to svn
![Page 4: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/4.jpg)
and commit
![Page 5: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/5.jpg)
now we can see that we have the project in the trunk and still the branch is empty
![Page 6: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/6.jpg)
now we create the branch
![Page 7: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/7.jpg)
![Page 8: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/8.jpg)
![Page 9: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/9.jpg)
now we need to make update for the changes that we made to take effect
![Page 10: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/10.jpg)
the result – we have the project in the branch
![Page 11: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/11.jpg)
right now we can open in visual studio the project in trunk or in the branch and start working, every commit that we do it will only affect his current project, for example, if we made changes in the project in the trunk and made commit it will not affect the project in the branch, and the same thing if we made change in the project in the branch.
How to merge the branch into the trunk
we can merge direct from branch to trunk- but for security reasons it will better to merge from trunk to branch, fix the conflict and then merge from branch to trunk.
How to merge from trunk to branch
lets made change in trunk and commit
![Page 12: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/12.jpg)
before the merge this is the branch project
![Page 13: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/13.jpg)
now let's make the merge
![Page 14: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/14.jpg)
![Page 15: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/15.jpg)
![Page 16: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/16.jpg)
we right from where we want the merge
![Page 17: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/17.jpg)
![Page 18: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/18.jpg)
now lets make commit for the changes to take effect
![Page 19: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/19.jpg)
![Page 20: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/20.jpg)
![Page 21: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/21.jpg)
and now we can see the changes in the branch
![Page 22: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/22.jpg)
now we add something in the branch and make commit
![Page 23: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/23.jpg)
now let's merge from the branch to trunk
![Page 24: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/24.jpg)
![Page 25: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/25.jpg)
![Page 26: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/26.jpg)
and again let's commit for the changes to take effect
![Page 27: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/27.jpg)
and now this is the trunk
![Page 28: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/28.jpg)
how to handle conflicts
let's say we change the file in the trunk and in the branch. And we make merge from the trunk to branchthis the current changes
![Page 29: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/29.jpg)
it notify me that there is conflict we choose "resolve later" the reason is, we want to fix the conflict in the visual studio
we make commit for changes take effect, and now we return to the project in the branch to fix the conflict
![Page 30: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/30.jpg)
![Page 31: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/31.jpg)
lets choose the both rows and press on "accept merge" , and after that we can choose resolve conflict and make commit
![Page 32: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/32.jpg)
that's it, now we can merge from the branch to the trunk and we will not get conflicts.
Enjoy :-)
![Page 33: create branch from project in the trunk … · Web viewlets create new project in visual studio in trunk. lets add new file and call him trunk – no reason. let's add all files](https://reader031.fdocuments.in/reader031/viewer/2022030405/5a7e06d27f8b9a563b8e3290/html5/thumbnails/33.jpg)