search

SPECFEM / specfem3d

SPECFEM3D_Cartesian simulates acoustic (fluid), elastic (solid), coupled acoustic/elastic, poroelastic or seismic wave propagation in any type of conforming mesh of hexahedra (structured or not).
GNU General Public License v3.0
392 stars 223 forks source link

Solved: Files with long filenames in main directory #1526 #1535

Closed slimkaki closed 1 year ago

slimkaki commented 1 year ago

Shorting long filenames and merging two existing READMEs

buildbot-princeton commented 1 year ago

Your changes cannot be merged with a fast-forward merge. This indicates that your repo is out of sync with the central repo. If you are using hub, do: $ git pull If your are not using hub, do: $ git pull upstream devel Then open a new pull-request.

danielpeter commented 1 year ago

this means that your forked version is on an older commit. you could use git rebase .. to update to the most recent code version:

git fetch upstream 
git rebase --interactive upstream/devel