Home / Questions / 155381
Accepted
gbianchi
Asked: 2020-04-13 12:02:08 +0800 CST 2020-04-13 12:02:08 +0800 CST

Once I PR a repo, do I have to delete my fork?

  • 772

Working with a free project on GitHub, I forked it, made some changes and asked for a PR, which was accepted.

I upgraded my fork upstream and kept making other changes, then did another PR again.

At that point, I realized that my new PR included all the commits I had already done, and even all the files.

I was supposed to be upstream by now, but either I missed something, or my fork never found out about the accepted PR.

To avoid that, I made a branch with only the modified files. However, the PR for that branch still includes all the commits I've made.

Not so with the files, only the modified one goes.

So what is the correct way to work when one forks a project?

Should I have run any more commands besides upstream? Or do I just have to empty my fork after each PR and go back to work as if it were from scratch?

git

1 Answers

  1. Best Answer

    It sounds like you're going to be collaborating on this project for a long time, not like you want to fix a bug and be gone.

    In that case, you can do the following:

    1. Never touch master. In your fork, masterreflect the state of the original project.
    2. The first time, set up a remote upstreamthat points to the original project, by doing git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git.
    3. Make all your changes always in a branch. Let's imagine you are working on the branch feature-guau. You can push calmly, all of that remains in your fork.
    4. Once you want to send a PR, you do a PR of tufork/feature-guaua proyecto-original/master.
    5. The maintainer asks you to work on your PR, you keep uploading each change you make to your branch (this updates the PR)
    6. Once the maintainer merges the PR, it becomes on his master... but not on yours!
    7. What you have to do now is bring the one masterfrom upstream. For that:
      • Do git checkout master(that makes you go to work on your master (which is outdated).
      • do git fetch upstream(that makes your computer "know" what's in upstream/master, but doesn't make any changes)
      • I did git reset --hard upstream/master. That makes your masterworth the same as the master of the original repository. Since your PR was merged, he brought it.
      • Finally, you have to update your fork... for that, you can do git push -f. That's going to make your fork point to the exact same place as the original project.

    You can do step 7 at any time, regardless of whether your PR was merged or not... what it does is sync master.

    • 12