CODEWITHSUNDEEP
gitgithubmergeversion-control
Ant
Ant

Reputation: 462

Update one branch from another

In the 'old' GitHub for Desktop application there was a button that would allow you to update from another branch.

What this does, is takes any commits from the other branch that haven't been synced into the current branch and creates a commit for the merge.

The new desktop application is missing this feature, but I use it all the time. What is the Git command line version of this? What is the desktop application doing?

For a more detailed explanation, say I make three commits to master (or any branch). We'll call these commit A, B and C.

Then we branch from master (or any branch) and make a commit to the sub-branch. Let's call that D.

Then we make two commits to the original branch (commits E and F). How do I then replicate what the desktop application does and merge commits E and F into the sub-branch, creating another commit (commit G)?

Upvotes: 0

Views: 520

Answers (1)

Justinas Marozas
Justinas Marozas

Reputation: 2652

$ git branch -l # just to show we're on develop branch and there's master branch as well
* develop
  master
$ git merge master

Will get master merged into develop.

Upvotes: 1

Related Questions