Git thread and github

Question

I am trying to understand how a Git thread works with Github.

Github allows you to use the fork / pull model to integrate changes, where all upstream repositories and all its branches are copied to the fork.

Then, using the Git thread, I would set aside the dev branch, and then, when done, my changes will be merged into the dev branch of my fork, and not upstream. Therefore, when the transfer request is executed back up the repo, it combines dev (fork) into dev (upstream), but this loses all knowledge about my function branch, etc. Ever existed.

So for the Git thread to work correctly, would I need to stop expanding the repo and creating function branches directly in the upstream repo?

So should fork / pull be kept separate from the Git thread?

Answer 1

So should fork / pull be kept separate from git thread?

Yes:

• one ( Gitflow ) is a merge workflow (what needs to be merged from source to where)
• the other ( request for GitHub fork / pull ) is a publication document (what to click and where)

The Atlas Workflow Textbook has two sections:

• one for gitflow

• one for forking workflow

Just want to know whether to use git-flow in an upstream or fork.
It makes no sense for me to use git-flow in a fork, since you lose all information when merging back to the repository up

Exactly: an attempt to merge the two work processes does not make sense, since both are used for different needs:

• gitflow : sharing a blissful git repository where all developers can click (and must agree on a branch and merge agreement)
• forking workflow : there is no access to one common repo, therefore, a fork is required (a repo that one developer owns and can click), with asynchronous contributions back to the original repo through transfer requests.