Applying a diff file with git

Question

So I was trying to use apply a diff file to my git dev branch. The diff I wanted to apply was this one here: https://github.com/mbabker/joomla-cms/compare/JHtml_move.patch

Answer 1

I had the same problem You have a rebase in progress, write

git rebase --skip 

many times, until see No rebase in progress? then try again with git am