#FIXING MERGE CONFLICTS IN P4MERGE INSTALL#
#FIXING MERGE CONFLICTS IN P4MERGE UPDATE#

Start the DJI Go app on the mobile device connected to the DJI Phantom 4 remote controller.

Turn on the Phantom 4 remote controller.

Connect a mobile device to the DJI Phantom 4 remote controller with a USB cable.

Turn off the Phantom 4 with the power switch on the battery.

I have not found a graceful way to finish the update, but the following steps make the Phantom work again.

If I turn off the DJI Phantom 4 and turn it on again the rear lights blink fast yellow (or fast white), and the DJI Assistant 2 application cannot recognize the DJI Phantom 4 anymore through the USB cable.

#FIXING MERGE CONFLICTS IN P4MERGE UPDATE#

When I update the DJI Phantom 4 firmware with DJI Assistant 2 most of the times the update stops at 92%.

#FIXING MERGE CONFLICTS IN P4MERGE INSTALL#

Gem install net-ssh -v 2.9.3.beta1 Posted by Laszlo Pinter JAugPosted in Chef, Cloud computing, DevOps Tags: Chef, Ruby, TestKitchen Leave a comment on Error in Test Kitchen after installing ChefDK DevOps interview questions To make Test Kitchen work again execute the following:

Fixing merge conflicts in p4merge