I made certain changes in my local branch. I didn't commit. I just indexed all changes and moved them to stash. Now I did a
git pull
After git pull I did
git stash apply
Now there are some conflicts. In eclipse I am able to see the conflicts in normal git format
<<<< Updated Upstream
ksldjflsdk
sdlkfjdslk
sdlkfjsdlk
===========
sdlkfjdslk
dslkfjdslkfj
dsklfjsdlkjf
>>>>> Stashed Changes
Now there are some files with hell lot of conflicts. It is very difficult for me to look up and down and merge. Is there a way I can move current merge process to beyond compare.
I am on git version 1.8.3 and Beyond Compare 3.2.3
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With