Failed push #49
-
|
Hi Albert, I tried to
Earlier today, I commited the report by mistake when it was not finished. I deleted it manually from GitHub. It's possible that this is the origin of the error? I tried How can I solve it? Thank you |
Beta Was this translation helpful? Give feedback.
Replies: 3 comments
-
|
I saw in the "history" of my B-branch that the merge did happen. The thing is, that the merge is between
I tried again to commit the report, but I cannot see it in my history although it was (in theory) done:
Is this a serious problem? |
Beta Was this translation helpful? Give feedback.
-
|
In principle, there is no problem to merge a branch with itself. That seams (form your first post) that you have started to work from a PC that didn't have the local repository updated with the last changes in the remote repository (maybe you edited something from another PC or from the website directly). When you try to push, Git told you that you missed some updates from the remote repository, and you need to incorporate them to your local repository before push. The terminal told you what command to use ( For me, it looks fine 😉 |
Beta Was this translation helpful? Give feedback.
-
|
Thank you!! |
Beta Was this translation helpful? Give feedback.
In principle, there is no problem to merge a branch with itself. That seams (form your first post) that you have started to work from a PC that didn't have the local repository updated with the last changes in the remote repository (maybe you edited something from another PC or from the website directly). When you try to push, Git told you that you missed some updates from the remote repository, and you need to incorporate them to your local repository before push. The terminal told you what command to use (
git pull). When you do so, a merge commit is performed to incorporate the missed updates from the remote repository.For me, it looks fine 😉