Manually merging data submissions

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

git show origin/master

Adam included this example python code to merge two existing tables.

In [22]: from astropy.table import vstack, Table

In [23]: diederiktable = Table.read('merged_table.ipac', format='ascii.ipac')

In [24]: maintable = Table.read('main_merged_table.ipac', format='ascii.ipac')

In [25]: newtable = vstack([maintable, diederiktable])

In [26]: newtable.write('new_table.ipac', format='ascii.ipac')