Merge Conflicts and Cherry Pick using Visual Studio (GIT) [March 2021]
Vložit
- čas přidán 28. 07. 2024
- Merge Conflicts and Cherry Pick specific GIT commits using Visual Studio. In this video you will see just how easy it is to grab a specific commit and bring it into your branch, or take all commits and merge it into any .Net, or other GIT-enabled project. Merge conflicts don't have to be a nightmare, watch this video to see how to solve them!
- Věda a technologie
Exactly what I was looking for! All killer, no filler.
Sweet!
Straight to the point, helped me very much. Thanks!!!
you saved a life today, thank you very much!
Thank you for detail explanation!
Glad it was helpful!
Explained really well.
Thank you!
Aprreciate the vid. helped me lots in a pinch
@guitarGuy64 that's great news! Glad you got what you needed.
best video ever.
Yay! thanks!
Explained well
Thank you @Lenin Edwin this is great to hear!
Thanks!
Good job thanks
You could using the magnifier tool in windows to zoom in.
@James Ryan thank you, I will keep that in mind for future videos where I need to zoom in on details!
Thank you bro! You saved me haha.
Glad I could help!
I can see only master branch from my repo via visual studio 2019 am I missing something? also via cmdline i am able to see develop and other branches. is there any setting required for this?
So, what I often do is connect to the git repo using "git bash here" in my folder in windows. Then I do 'git clone' and clone a remote branch from the server. Then open that cloned project in visual studio and it should have "knowledge" of the remote repo and all of the branches that you are looking for. You can then do the 'git' drop down box from the menus at the top and do 'manage branches', then there should be a 'remotes/orgin' just below the branch you are working on and if you double click on a branch within that it will create a local copy of that remote branch higher up in the list and select it. This will then change the branch in the bottom right of the screen. This isn't the only way to do this, you can clone a project from within visual studio, or within another app like vs code, and then open the solution file with visual studio and it takes it from there. Hope that helps? Have a great day Srivdhya Gopal, and thanks for watching my channel!
thanks
Your welcome!
How do you solve or handle the merge conflict when the code changes because a control like a button was added, edited or removed and the Designer.cs files are affected? I mean if there is a way to show the differences but visually of these controls, I hope this makes sense for you and thank you.
Sure thing, when I undo a change and the designer still shoes a difference in GIT - then I just 'undo changes' on that one file (the designer file). This has worked well for me.
@@DataVids thank you for your answer but I think I didn't explain well myself, for example you and I are working on the same project each other in different branches but in the same file in this case is a form named MyForm that has 2 buttons and 1 textbox and you added two extra buttons and resized the form and in my branch I added one label and change the font style but for some reason I need to do merge with your branch and these conflicts appear, what is the easiest way to solve these kind of conflicts?
Well that's tricky because its UI. I think it also depends on the template a bit (obviously winforms, WPF, and MVC are going to have drastically different efforts here - is there a stylesheet involved for example, etc), but you might have to accept certain changes from each side (left and right) when doing 'merge conflicts' in visual studio, save the file -> then run it locally and see how it looks, make additional changes to get it to look right, then do your commit & push. With UI there might not be a one-size fits all approach. Sorry, I know that's not the answer your looking for - and also there is always someone better, you might want to ask this on stack overflow too - and include the template type your using there so one of the experts in UI using that template can chime in.
@@DataVids Thank you for your answers, really I appreciate it and yeah I think UI is a special case.
10 minutes is not extremely short, good vid, though. Hey how bout you turn the next vid into a musical. 😂 Love Ya, Bro.
Aye a musical would sure be a new twist! I might need to bring in a guest star for that but oh man that does give me some good ideas!! 🤔🤔
@@DataVids I'm down. 😅
send me a video clip with you singing some datavids, and I will patch it in as the Intro on the next one! The wifey is going to make a clip too, oh man this is great~!
Nice
Thank you!
Which git extension you are using.. Please reply
Visual Studio
@@DataVids do vs code have all git features which is there in the pycharm?
@@DataVids also please suggest best git extension for vs code
Visual studio community, not vscode. Vscode has git extensions yes, but I just use visual studio or cmd line for git usually.