Chemhours

[SumilThakr]

Please take a look.

[ctessum]

So, I think the first thing that needs to be done is to rebase your changes so that they are relative to the most recent master version. To do that, you first need to make a copy of the master version (after making a backup copy of what you have):

git remote add spatialmodel git@github.com:spatialmodel/inmap.git # https://help.github.com/articles/adding-a-remote/
git fetch -f spatialmodel master # https://git-scm.com/docs/git-fetch

n.b. the commands above might overwrite any changes you have made in your master branch.

Then, rebase your changes on top of the master branch

git checkout chemhours
git rebase master

There may be some conflicting changes that you have to manually resolve.

Finally, push the rebased version to the pull request:

git push -f origin chemhours

[ctessum]

The tests are still failing; did you say you had an updated version of the golden file that causes the tests to pass?

[ctessum]

Closing as redundant to #48.