How to update my working Git branch from another branch (develop) ?

git github branch git-merge
Eki Eqbal picture Eki Eqbal · Oct 1, 2014 · Viewed 84.3k times · Source

I made a new branch for my code like a month ago, I created feature1 branch from develop branch. 

⇒  git branch 
  develop
* feature1

I've been working on feature1 for a month now and a lot of the changes pushed to develop branch, How can I update my current branch feature1 with the latest commits at develop one?

I don't want to checkout master and merge my feature1 branch. Neither I want to use git cherry-pick to manually move commits from develop to feature1.

Any help ?

Answer

musiKk picture musiKk · Oct 1, 2014

You just merge develop to feature1:

git checkout feature1
git merge develop

There is no need to involve another branch such as master.

Related questions

Git pull a certain branch from GitHub

I have a project with multiple branches. I've been pushing them to GitHub, and now that someone else is working on the project I need to pull their branches from GitHub. It works fine in master. But say that someone …

Read More
How can I delete all Git branches which have been merged?

I have many Git branches. How do I delete branches which have already been merged? Is there an easy way to delete them all instead of deleting them one by one?

Read More
When does Git refresh the list of remote branches?

Using git branch --all shows all remote and local branches. When does Git refresh this list? On pull/push? And how do I refresh it using Git Bash?

Read More