hockeysetr.blogg.se

Smartgit merge two branches
Smartgit merge two branches








smartgit merge two branches

A merge involves a destination branch and a source branch. One thing I didn't make clear in the previous blog is that merge direction is important. This should happen frequently, to minimise the amount of conflicts you have to deal with at one time. A more typical merge scenario is working on a feature or fix branch, and wanting to keep it up to date with changes made by colleagues to the master/ develop/ other serious branch. In fact, with Git, a merge between three branches is possible, but I won't look at this option in this blog. It is the process of pulling the changes made in one branch into another branch. A merge is an operation carried out between branches.

smartgit merge two branches

Merging recapįirstly, a quick recap on the Git merge process. Like the previous posts, this post was written as I learned about the process, and starts from the basics. The next post in the series will continue this theme, looking at resolving conflicts with Semantic Merge, a language-aware diff and merge tool which presents merge information visually. I'll describe when conflicts occur and how they can be dealt with using Visual Studio, and third party Git client SmartGit.

#Smartgit merge two branches software

By Alice Waddicor Software Engineering Apprentice III 19th June 2014įollowing on from the previous post in this series which dealt with branching and pushing your changes, this post looks at how you can deal with merge conflicts.










Smartgit merge two branches