Merge Conflicts Guide | Visual Studio 2022 (Git)

Want to merge branches or forks on Github with conflicts, using Visual Studio? This guide shows you not only the GitHub website text editor merging method, but also the Visual Studio 2022 method - which is a lot better.

Timestamps:
00:00 - Explanation
00:25 - What are merge conflicts?
00:44 - Resolving conflicts on GitHub
01:55 - Manage Branches on VS 2022
02:47 - Merging in VS 2022
03:49 - Viewing changes on VS 2022
04:32 - Resolving conflicts in VS 2022
04:59 - Picking One file or another to merge
05:18 - Choosing specific conflicting changes to merge
07:00 - Cherry-picking changes from specific commits
07:23 - Merging and pushing changes

#VisualStudio2022 #GitHub #Guide
-----------------------------
-----------------------------

Everything in this video is my personal opinion and experience, and should not be considered professional advice. Always do your own research and make sure what you're doing is safe.

[nomad]

I have a small issue when doing this. Once I have merge conflicts I do the same as shown in this video. But when I commit, the whole bunch of changes go in my name though it was originally developed by someone else. Is this the default behaviour? Because I do change only conflicting files.

[drophy]

Very well explained, thanks! Just a quick note: at 8:11, I don't think that's Git getting confused. I think it says it's 8 commits behind master since there have been 8 commits in master branch since the GameStats branch was created (or last updated with the changes from Master).

In the video, our merge takes the changes in GameStats and adds them to the Master branch, but any changes that have happened to the Master branch since 8 commits haven't been added to our GameStats branch. We'd need to run "git merge master" while in GameStats branch for that.

[God-ldll]

Can you do a Universe Operating System opt next? Judgement program is loading slowly.

[BAMBOORODS]

Could you update the phasmopobia microphone fix, it doesent work. Thx

[lime-nijayt]

I hope you can fix this
My problem is ark on epic games it automatically add dls and the game becomes more then 300 gb and I can install it and I don't know a way to remove the dls or add_ons

[nickcrawford]

Wassup technobe can u plz make a video on headphones for pc mine keep echoing for some reason

[sgtmohan]

I have made some mistakes while solving the conflicts and then created a pull request through the visual studio.

Can u explain to me about how to undo that pull request so that I can start freshly check and solve the conflicts again

[randyjayparker]

Which git extension provided the menu bar "Git" that you selected at 2:11 ?