Important knitting question!

So, I'm knitting away. Scarf is on the left-hand needle, and I'm sitting here carefully knitting, during the course of which, the scarf sidles off onto the right-hand needle.
I get to the end of the row. What am I supposed to do now?

1. Pick up the needle with the scarf on it, move it into my left hand, put the empty needle in my right, and start knitting again.
2. Pick up the empty left-hand needle and knit the next row backwards until the scarf is on the left hand needle again.

I had assumed that I was supposed to do 2, but it was rather too hard so I opted for 1. Poking at knittinghelp.com suggests that English and Continental knitting are distinguished by which needle the knitting starts on - this leads me to believe you're supposed to always start the row with the knitting on the left for English and right for Continental?

Ooops.

Decided to end my Practice Square. Dropped a stitch two from the end of the casting off row. Knitting unravelled all over the place. EEP.