How to get updates from Master into Branch in TortoiseGit

Question

I created a branch in the Git repository 10 days before and worked on some changes in the created branch. Now I need to update my branch with the help of the main updates (i.e., complete the work on the master after the accepted branch) and need to be combined with the master.

Help me how to do this in TortoiseGit.

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

Thanks,

Answer 1

The team you are looking for is "merge".

With merging, you can integrate changes from another branch into your active branch, for example. Integrate your branch changes into the wizard.

Merging can be done in several ways:

• Open the context menu in Explorer, open the TortoiseGit submenu, and select Merge.
• Open the log dialog and right-click the commit / branch you want to merge and select merge.

In both cases, the same dialogue opens. Here you can select / check the branch and set some additional parameters. When you click Ok, the merge will begin.

Whenever you mix conflicts, it may arise, for example. the same file is edited on both branches., which must be manually resolved and committed (as a result of merge commination, your changes are included, as well as changes of the other branch).

Here it is.

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