Does an upload request to the upstream repository contain commits previously received or merged with the upstream repository?

I'm new to git and github, so apologize for the newbies question. I was looking for documentation and could not say what I am doing wrong, or even if I am doing it wrong ...

I unlocked the repo on github, cloned it locally, made some changes to a couple of branches, fixed these changes locally and pushed them to the forked repo on github. While I was working on this material, many compromises were made with the upstream repository from which I was visible. I'm not sure if this is the right thing to do, but I pulled and combined these upstream changes and then clicked on my fork again.

Now I want to send a transfer request to the repository up. But when I start to do this, github lists all the commits that will be part of the migration request, and includes all the changes that have already been made to the upstream repository, which I have already downloaded and merged.

This does not seem right. What do i need to do here?

+5
source share
1 answer

This is normal since you have dragged these commits into a forked repo and therefore they logically belong to your pull request.

When the retrieval request is merged up by the owner of the repository, Git discovers that it already “contains” some of the commits and will only merge into your changes.

Just create a pull request, and that's all right.

+4
source

All Articles