search

gulfofmaine / sdm_workflow

A repository to help streamline the species distribution model development and prediction workflow.
MIT License
2 stars 0 forks source link

Unsure why this can't merge #28

Closed adamkemberling closed 3 years ago

adamkemberling commented 3 years ago

This commit has the bias correction rmd files with the changes I meant to send initially. doesn't seem to want to merge, though there are only new files so there shouldn't be any conflicts...

abkfenris commented 3 years ago

Can you merge main into this branch on your own machine? Probably using Fork or Sourcetree instead of the Git client built into RStudio.

adamkemberling commented 3 years ago

I'm not sure I understand what you mean @abkfenris. This is the main branch. You mean do this PR in reverse?

abkfenris commented 3 years ago

Yup, just because this is the main branch on the gulfofmaine repo, it doesn't mean that its history is the same as the main branch on your repo.

At a high level, the git commit history is a tree. Each commit keeps track of it's parent(s). A branch is really the same as a specialized tag pointing to a specific commit. adamkemberling:main can point to a different commit than gulfofmaine:main.

If you are having a hard time merging into an upstream branch, usually you can first merge the upstream branch into yours, deal with any conflicts, make a new commit, then the PR should be able to be merged as the commits have been explicitly taken care of.

One way to decrease the likelihood of having these sorts of issues is to always work off of the main branch. Anytime you start a new branch, you start it from the latest upstream main branch, and make PRs back to it. Then your downstream main branch can follow the upstream main without ending up with diverging histories.