GenericMappingTools / gmtserver-admin

Cache data and script for managing the GMT data server

GNU Lesser General Public License v3.0

7 stars 3 forks source link

Geologists data #67

Closed PaulWessel closed 4 years ago

PaulWessel commented 4 years ago

Add this file also, used by the 1st example in the paperl @seisman, yesterday I think I tried to commit a small change directly to master but it somehow failed, and now it lists these two commits in addition to the one I want: 7c70870 abd d7d617f Also these show up as uncommitted in my Desktop Git GUI and I dont know how to get rid of them . Need your git magic advice.

seisman commented 4 years ago

Is everything OK if you checkout your master branch and update it?

PaulWessel commented 4 years ago

I just ran git pull in gmtserver-admin and it popped up a file in my editor called MERGE_MSG taht contains

Merge branch 'master' of https://github.com/GenericMappingTools/gmtserver-admin

Please enter a commit message to explain why this merge is necessary,

especially if it merges an updated upstream into a topic branch.

Lines starting with '#' will be ignored, and an empty message aborts

the commit.

Since everything is (I think) find in github, should I just delete my working copy and clone again?

seisman commented 4 years ago

should I just delete my working copy and clone again?

Yes, it's easier.

PaulWessel commented 4 years ago

OK, back to normal, Thanks.