Handling Merge Conflicts with Visual Studio and SourceTree (7 of 9)

[DougKelleyDeveloperAccountant]

Thank you so much! Understanding the merge interface in VS2019 was what I was looking for, and you answered it perfectly! :)

[Caffeine_Addict_]

Incredible video Dana!! This was, and has been, a lifesaver. I come back to this video every time I have to deal with a merge-conflict in sourcetree. Thank you so much!!

[Urbie]

Thanks, Dana! I'm new to Sourcetree, and since it doesn't come with much doc, tutorials like these are just what I need! :)

[starlite]

Thanks, very informative and this series is exactly what I want.

[KaylaBurns-dzhb]

THANK YOU SO MUCH I so appreciate this, so helpful

[matthewvaughan]

Great tutorial Dana. Thanks for posting.

[cango]

Thanks Dana, currently trying to get to grips with this and your videos have helped :-)

[mohankumar]

Thank you Dana !! Nice video to learn the merging concept!

[misterguts]

Thank you Dana, this was exactly what I needed to learn today! Take care!

[jamesfuller]

This tutorial is still a lifesaver today! Thank you so very much!

[mido]

this was extremely helpful and it's just what i needed so thank you.

[DaviesOdu]

Resolve merge conflict with visual studio starts at 3:29

[gdk]

Hello Dr. Dana, might you have made a mistake by saying "before I attempt to make a Pull request", when you meant to say "before I attempt to make a push request" @02:42? Or am I just confused?

[chingching]

Thanks, Dana! I'm new to SourceTree, how to handle the branch after merge to master? I try to delete the branch, the red label with "branch" name disappear but the graph still showing the [origin/{branch name}] which is in RED color. Do you know why?

[johndematis]

Great tutorial series. One question though: Why didn't you push to the remote branch DanaW, so as to bring that up to date, before attempting a pull request?

[sandeep]

I am completely new to visual studio. I see there is Visual Studio Code and Visual Studio. Which one should I use? Thanks!

[IzumiVNaruto]

Why my merge conflict pop up / page didnt show??? Its merge the code by themselves..

[nileshkulkarni]

Thank You Very Much, this is what is was looking for. Saviour.!!

[carlabalos]

Wait is this video only about fixing merge conflicts with scripts? How about if there are merge conflicts with scenes in unity?

[dattu]

Great Video. All videos i see are working with only 1 file that has conflicts.
I am looking for a scenario where 1 file is in conflict and there are some new changes in the branch where i will be raised pull request.
I have a question. Our process is little different. We are using bitbucket
Can you let me know what would be the right way to do it
master
every week we create release_week
each developers creates branches for bugs from master, after that pull request to release and merge it.
I have a case where i modified 2 files. when i created pull request to release, it showed merge conflict on one file.
I followed similar to above steps
git pull origin releasebranch
this bought all the files that are changed in release (master to release) to my local.
1 merge conflict file and 5 files that have changes in release branch
I resolved the merge conflict of the one file it complained.
--
But i need to push all the other files from release again to my branch. This will show up like i made changes to the files in the pull request. Those changes are from release branch, i did not change them.
can you tell me the better way to do it so that my pull request will have only the changes needed. I don't need to show automerge files that are in release as new changes in my branch.