Creating GIT branch and merge

--- to create:

git checkout master
$ git checkout -b new-branch

--- to merge

git commit -am "commit file in branch"

git checkout master

git merge new-branch

Resizing image to create thumbnail in MAC

to resize an image or images in a directory use the following command:

//to resize all of the images in a directory to 245x245 size
sips --resampleHeightWidth 245 245 *