Thanks for changes - unfortunately the script was renamed by another merge while you were working on this.
This script bin/graphics_driver has been renamed to bin/graphics_driver.py
I think it should be possible to resolve this doing a rebase:
$ git checkout master $ git pull $ git checkout bug/lp-188... $ git rebase master $ git push -f <remote> bug/lp-188...
« Back to merge proposal
Thanks for changes - unfortunately the script was renamed by another merge while you were working on this.
This script bin/graphics_driver has been renamed to bin/graphics_ driver. py
I think it should be possible to resolve this doing a rebase:
$ git checkout master
$ git pull
$ git checkout bug/lp-188...
$ git rebase master
$ git push -f <remote> bug/lp-188...