# Suggestions for merging my changes in to Leaflet.DistortableImage.

git checkout refactoring # move to local branch (if you've already pulled my refactoring branch down)
git fetch justin refactoring # pull in my rebased version
git reset justin/refactoring --hard # overwrite local version with new commits from rebase

# next, make copies of `src/DistortableImageOverlay` and `README.md`, the files you changed in 70ca8184d42b3db132d7eeafef801aafb6b5d9ce ("lock on doubleclick", Dec 18)

git checkout 264e3866f4dc82ef6fbe39a548cfb11de41c38a1 # "selecting, ordering, planning" from Dec 16, 2014 - the last commit I was able to rebase on.
git merge --ff-only # because I did a git-rebase, you should be able to do a simple fast-forward merge.  If it doesn't work, you may have to go one commit back or forward in the master branch.

# finally, reapply the changes you made and make a new commit with those changes.  This shouldn't take long - it's only 21 additions and 3 deletions.