Fix dataset bci_stem_1995: It has 0 rows.

forestgeo / AGBfluxes

Compute flux of biomass at ForestGEO sites.

https://forestgeo.github.io/AGBfluxes/

GNU General Public License v3.0

2 stars 1 forks source link

Fix dataset bci_stem_1995: It has 0 rows. #3

Closed maurolepore closed 6 years ago

ErvanCH commented 6 years ago

Done, but I can't push the data...

maurolepore commented 6 years ago

Why can't you push? Can you give me some detail? Can you push other things but not the data? Do you get any error message that might guide us towards a solution?

ErvanCH commented 6 years ago

That's the message I get:

C:/Program Files/Git/bin/git.exe pull error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict.

maurolepore commented 6 years ago

It seems like you need to first pull, then push.

ErvanCH commented 6 years ago

Solved