I have 5 branches in sourcetree which has various files in it
for eg- blogs-b2,blogs-log,frontaccounting,crm,contentmanagement
I want to merge the contents of these branches into a single branch named Simplescripts.
If you have any conflicts after 2. you can resolve them by right-clicking the file, selecting Resolve Conflicts and picking an option, such as Resolve in External Merge Tool to interactively merge with a merge tool.
(Note, in git there's a type of merge called an 'octopus merge', where you can merge many branches into one at once. SourceTree can display octopus merges but doesn't let you create them right now - to be honest I think separate merges are tidier anyway ;))
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG