Closed zhengyang92 closed 11 years ago
your patch contains all the already merged stuff again - I guess you forgot to use the --rebase option (e.g did not git pull --rebase but just git pull). Could you please fix that?
Ok