search

pombase / fypo

Fission Yeast Phenotype Ontology
Creative Commons Attribution 4.0 International
14 stars 6 forks source link

FYPO merge error #4362

Closed ValWood closed 1 year ago

ValWood commented 1 year ago

I always get this error

Screenshot 2023-06-20 at 16 07 55

does anyone know why?

manulera commented 1 year ago

Hi @ValWood. I think this is unrelated to #4360. I am pasting here the answer from a previous email exchange so that it's easier to find. I will reply to the email so that you see it.

Short answer:

Do git branch -D (capital letter), then go to master and pull

Long answer:

The problem may arise because of the "Squash and merge" that occurs in the pull request. Basically, when you create your branch you made a series of commits, and then made a pull request. When the pull request is merged into master, all changes made to your branch in several commits get squashed into a single commit, so even though your branch and master are identical in the code, their histories are not. Maybe this also happens if there is a single commit when you run squash and merge.

download

ValWood commented 1 year ago

I remember you told me this before.