Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest FMS version #394

Merged
merged 1 commit into from
Sep 17, 2024
Merged

Conversation

aidanheerdegen
Copy link
Contributor

Update to latest FMS version from fork via subrepo

Closes #393

git subrepo clone (merge) --force git@github.com:mom-ocean/FMS.git src/shared

subrepo:
  subdir:   "src/shared"
  merged:   "98a5532b"
upstream:
  origin:   "git@github.com:mom-ocean/FMS.git"
  branch:   "master"
  commit:   "98a5532b"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "57de7d6"

…c/shared

subrepo:
  subdir:   "src/shared"
  merged:   "98a5532b"
upstream:
  origin:   "git@github.com:mom-ocean/FMS.git"
  branch:   "master"
  commit:   "98a5532b"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "57de7d6"
@aidanheerdegen
Copy link
Contributor Author

Unsurprisingly this doesn't record the changes to the files shown in the PR that pulled the commits back to the FMS repo

mom-ocean/FMS#9

Because the files haven't changed as far as the MOM5 history is concerned.

I'm sanguine about it, but it does mean git blame won't track back to this commit. Do we care?

@aidanheerdegen aidanheerdegen merged commit 6bdbdd4 into master Sep 17, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update FMS version
2 participants