Eclipse - Merge and Resolve Conflicts with git

Really thanks Mate!

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

pure gold

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

Muito bom, obrigado pela ajuda!!!!

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

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

thanks lot bro (y)

Thank you!!!

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.

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.

Most informative 90 seconds about merging in my life lol

Thank you so much :)

thanks you saved my day

thx broo,. very helpful for me

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

thanks

wow your video saved me. Thanks man!

Thank you very much!