In [1]:

    

cd /usgs/data2/notebook/UGRID


    

    




/usgs/data2/notebook/UGRID

In [2]:

    

!git add ugrid*


    

In [3]:

    

!git commit -m 'adding json stuff'


    

    




U	UGRID/ESTOFS_water_levels.ipynb
error: 'commit' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: Exiting because of an unresolved conflict.

In [ ]: