Resolve merge conflict during git rebase

[@ketanchaudhari2337]

alias graph='git log --all --decorate --oneline --graph'
alias conflict='git diff --name-only --diff-filter=U'

[@ledzeppelin1212]

Very helpful! Thank you!

[@stevenlee1726]

Welcome

[@terrabyte-techy]

Thank you so much. That was really helpful.

[@salvadorhernandez2987]

amazingly simple and useful case explanation, cheers

[@stevenlee1726]

Thanks bro

[@Pratikmayekar4]

So useful and concise. Thank you very much!

[@SM-yw4cy]

Thanks.. to the point and informative.

[@sriram007m]

Simple and clean, Thank you Lee!

[@peterpopovics8794]

Nice work, sir, thank you for the tutorial!

[@emmanuelraj9190]

Awesome example! Thank you!

[@stevenlee1726]

No problem

[@projektplay3382]

thanks, this is great!

[@AdeyemiOgunnaike]

Thanks alot

[@gunasekarant6498]

clearly explained

[@igobivo]

not visual enough :(