Workflow for working with a team that doesn't use version control when only FTP access is available.

Workflow FTP no VCS

# 1) merge changes from live server

# create new branch for downloading live changes into
git branch live
git checkout live

# in working directory:
#     delete old files
#     download new/modified files
# (need magic here!)

# commit to branch
git commit -a -m 'download and merge changes from live server'

# merge live into master
git checkout master
git merge live

# remove branch (if desired)
git branch -d live

# 2) make changes in working directory (typical process)

# 3) deploy changes to live server

# merge changes as shown in step 1

# on ftp server:
#     delete old files
#     upload new/modified files
# (need magic here!)

Workflow: FTP no VCS

##### 1) merge changes from live server #####

# create new branch for downloading live changes into
git branch live
git checkout live

# in working directory:
#     delete old files
#     download new/modified files
# (need magic here!)

# commit to branch
git commit -a -m 'download and merge changes from live server'

# merge live into master
git checkout master
git merge live

# remove branch (if desired)
git branch -d live

##### 2) make changes in working directory #####

##### 3) deploy changes to live server #####

# merge changes as shown in step 1

# on ftp server:
#     delete old files
#     upload new/modified files
# (need magic here!)