Sending multiple tensile requests to Git using Github (Shared stream)

I am not a git expert in any way, so I want to make sure the following thread is good:

  • Find the repo I want to contribute to. (original repo)
  • Set up the original repo on github. (my fork)
  • Clone my forks for my car, outside of any project I'm working on. (isolated clone)
  • Include my plug as a submodule of the project in which I want to use it. (submodule clone)
  • Create a function branch on an isolated clone and add some things.
  • Create another function branch and other unrelated things.
  • Add the original repo as a remote to my isolated clone .
  • Reinstall the original repo .
  • Click and pull two property branches into my master isolated clone .
  • Pull from the submodule that is in my project.
  • Send requests for output to the original repo from each function branch in an isolated clone .
  • Pull requests are accepted.
  • Expand the main branch of my fork to reflect the new master with my changes.

Are there any errors?

And then with that, what should I do with my function branches on my local machine? Perhaps relocate them to my local master? Delete them (is that bad?)?

If they do not agree with my requests, I would still like to combine them with my local master. Will it hurt anything?

I am trying to figure out a thread that allows me to send requests based on functions, but also use my changes in my project, regardless of their acceptance, and my local copy right after they accepted / rejected them.

It reads a lot, but thanks for any help!

Edit: Found this related article every other day. Does not answer the complexity of my question, but is still useful: http://codeigniter.com/news/contribution_guide#When:13:36:15Z

+6
source share
1 answer

The submodule part complicates things a bit, but otherwise:

  • 9: pull? you would push your bifunctional branch toward your fork (an "isolated clone") rather than pull them. This will save these commits on your remote repo.
    And in fact, to request a stretch, you have to click one branch with all the commits that you want to offer. See the next paragraph.
  • 11: submit pull request: The idea of ​​a pull request is to offer accelerated merging for the original project. Therefore, while you need to reinstall the commits that you want to include in your request to migrate over a branch (for example, master ), the original repo will need to be updated with your commits. To do this, it is recommended:
    • pull out the original repo first (to make sure master updated)
    • update your function branches on top of master (again master is an example here) as one new branch (and check if your two new functions originally developed in their own branch work)
    • push this new branch to your fork
    • suggest committing this new branch as a stretch request for master

As koffie commented , a reboot is possible if you only work with this branch of the function (and then push --force ).

If you want to contribute to the project, you should not directly change the history of the commit branch to which you will contribute: if you want to make a request to transfer the source repo to master , you shouldn’t click anything on the master your fork (except for commits coming from the outflow of the original repo)
You should always work in a separate branch.

+3
source

Source: https://habr.com/ru/post/897875/


All Articles