Using git-flow, how to work with swapping to mix

Question

I am new to reinstalling. I'm used to the git-flow method , as a result of which I disconnect our main / branched branch, do my work, open a transfer request on github, and it merged, and we move on. It works well.

However, others are resetting, and I would like to try. I read about it ( here , for example), and when I get this idea, one bit confuses me.

In git-flow, when I make my changes to my branch, I push this branch to the server and open a transfer request. In rebase, the link above tells me Periodically rebase your feature branch onto the current state of the destination branch..

... and if I do that, then I click on github? In the branch I was based on ( developin my case)? Like a git guy who feels weird to me, but maybe because I'm not used to it.

If there are other ideas on how to mentally switch from git-flow to rebooting, I am also glad to hear about it.

Answer 1

Say your function branch looks like this:

* -- * -- A (master)
           \
            * -- * -- * (feature)

After some time, others did work masterto make history

* -- * -- A -- B -- C -- D -- E (master)
           \
            * -- * -- * (feature)

The only thing rebooting featureon masteris to change, when it appears, you created a branch feature:

* -- * -- A -- B -- C -- D -- E (master)
                               \
                                * -- * -- * (feature)

, , . master , feature. rebase , , , feature master. , , feature; , feature .

Answer 2

( , / ), :

git fetch origin            # Updates origin/master
git rebase origin/master    # Rebases current branch onto origin/master

:

git pull --rebase origin master

, origin/master. , / . git.