Very Basic yet very Important Question

We use ‘develop’ as the ‘master’ branch.

We pull from the fork and the local ‘develop’ branch is now up to date.

I am working on a feature branch.

Once again…we pull from the fork and the local ‘develop’ branch is now up to date.

Now the local feature branch needs to be updated, how is this done?  Do I pull from the local develop branch to the local feature branch?

Thank you; all this is very interesting,

Joshei

1 Like

Hi @joshei,

If you’re wanting to do this on your local machine, you can use git merge develop when you have the feature branch checked out to incorporate the changes that you pulled down from the develop branch.

Does that help?

1 Like