Eclipse - Merge and Resolve Conflicts with git

Sometimes when merging with remote branches conflicts occur. This is one way to resolve the merge conflicts by using the merge tool to copy and resolve conflicts.

[NineSins]

Most informative 90 seconds about merging in my life lol

[ghostxxtv]

7 and a half year old video saving me in 2022. Thanks a lot Bradon.

[twitertaker]

Thank you. I am at work and everybody waited for as I struggled with this. I have never merged something using eclipse before and you saved me from standing there like an idiot.

[Lexyvil]

Clear and straight to the point! Thank you, good ser.

[OmmeJudepPackMaker]

I love you, we struggle with that for 2 days for a project you saved us

[judyliu]

Thank you very much for posting this tutorial!! This saves my project~

[nicolasap]

OMG THANK YOU! I wish I could shake your hand!

[faceITnow]

What if I don't want to take remote changes, and keep just my file intact

[ebuzertahakanat]

for eclipse users:
dont add your eclipse related setting files to index and if someone did it and you faced a situation where you cant push because of conflict and when you pull merge tool doesnt open, open git stagin view and R-Click ignore all the project eclipse settings files.

your welcome

[ganeshavhad]

solved after watching this video #github

[akashmulik]

Dude, you are merging which branch to which one?? explain properly

[akk]

The age of silent movies is long gone; -1 for no audio!

[ajaychowdarykandula]

Thank you. I am at work and everybody waited for as I struggled with this. I have never merged something using eclipse before and you saved me from standing there like an idiot.