Code review comment for ~williamhsu/plainbox-provider-checkbox/+git/plainbox-provide-checkbox:bug/lp-1884235/exchanged-the-sequence-of-graphics-log-parsing

Revision history for this message
Jonathan Cave (jocave) wrote :

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