How to take updates from Master into Branch in TortoiseGit

git branch tortoisegit master
Rithik_Star picture Rithik_Star · Nov 18, 2016 · Viewed 11.2k times · Source

I have created a branch in Git repository 10 days before and worked on some changes in the created branch. Now I need to update my branch with master updates (ie commits done over the master after the branch taken) and need to merge with master.

help me how to achieve this in TortoiseGit.

Guide me with TortoiseGit not through Git bash or Git CLI etc.

Thanks,

Answer

MrTux picture MrTux · Nov 18, 2016

The command you are looking for is "merge".

With merge you can integrate the changes of another branch into your active branch, e.g. integrate the changes of your Branch into master.

Merging can be done using several ways:

  1. Open the context menu in explorer, open the TortoiseGit submenu and select Merge.
  2. Open the log dialog and right click on the commit/branch you want to merge and select merge.

In both cases the very same dialog opens. Here you can select/check the branch and set some more advanced options. Clicking Ok will start the merge.

Whenever you merge conflicts can occurr, e.g. the very same file is edited on both branches., which need to be resolved manually and committed (the resulting merge commit includes your changes as well as the changes of the other branch).

Thats it.

See https://tortoisegit.org/docs/tortoisegit/tgit-dug-merge.html.

Related questions

Your configuration specifies to merge with the <branch name> from the remote, but no such ref was fetched.?

I am getting this error for pull: Your configuration specifies to merge with the ref 'refs/heads/feature/Sprint4/ABC-123-Branch' from the remote, but no such ref was fetched. This error is not coming for any other branch.The …

Read More
How do I delete a Git branch with TortoiseGit

Is there an option to delete a branch with TortoiseGit? I found a solution for the commandline. Is there an implementation in TortoiseGit?

Read More
Git fetch remote branch

My colleague and I are working on the same repository. We've branched it into two branches, each technically for different projects, but they have similarities, so we'll sometimes want to commit back to the *master from the branch. However, I …

Read More