Skip to content

Manually merging data submissions

snlongmore edited this page May 15, 2015 · 17 revisions

cd to database folder

git fetch

git checkout "branch name", where branch name is

git diff

git merge origin/master

fiddle around with merged_table.ipac

git add merged_table.ipac

git commit -m "Merged Diederik's file"

git push