Manually merging data submissions

The following steps explain how to merge different data submissions to a single master file.

Move to database folder:

cd database

Get the most recent database file:

git fetch

Check to see what branch you are currently using:

git branch

Which should display something like:

* SteveLongmore_2015-05-14T16_46_20.661968
  master

Checkout "branch name" -- in this example branch name is SteveLongmore_2015-05-14T16_46_20.661968

git checkout SteveLongmore_2015-05-14T16_46_20.661968

<<< ``` Don't think you need this 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')