Git pull the master to the remote branch by origin

Question

I have two remote branches: origin/masterandorigin/my_remote_feature

I checked my_remote_featurewithgit checkout --track -b origin/my_remote_feature

There are several changes in the wizard that I want to pull into my branch, which tracks the remote branch. How can I do it?

Answer 1

git rebase origin/master

All you really need to do. then resolve any conflicts. You may need

git rebase --continue

if there are conflicts. This will cause my_remote_feature to be committed on top of the HEAD source / master. Rewriting history, as it were.

git merge origin/master

. , , remote_feature. . , rebase .:)

Answer 2

- / . :

• my_remote_feature . git pull origin my_remote_feature

• git fetch

• / git rebase origin/master

• , . git push origin my_remote_feature

my_remote_feature. - , , , git rebase --continue .

Answer 3

Merge the branch masterinto your properties branch and then push the changes.