I have to merge a particular commit to another branch. Let's say I have 2 branches live and dev, when I complete the work in the dev need to merge those files to live branch. There are several people working in this project. I don't need to merge all the changes from others, just the changes from my side.
Whenever i tried to merge it always merge everything means all the changes from other user also. Anyone has a solution for this. I am not much familiar with Source tree, neither git.
Below an ref pic for my repo
You shouldn't have shared a branch with others if you would like to merge your changes only. If you really want to resolve your problem now, I would check out the root of the branch and create another new branch, then cherry pick your own changes only on the branch and merge it to
live. It might cause merge conflicts later when others try to merge their changes, though.
If you want a branch that only has your changes, first checkout the commit just before any changes are made (right-click on the Log/History and choose Checkout) and make a new branch there. Then, right-click on each your change and choose Cherry Pick until all your changes are committed on the new branch. Now you should have a branch that only has your changes and you could merge it to any other branch. It is not a good idea to have multiple independent changes intermixed on a single branch in my opinion. Make as many branches as necessary as merging a branch is quite easy.
If you want only the changes from a few commits (or just one, ideally), you can use the cherry-pick feature.
Checkout the branch you want to apply the changes to, then right-click the commit that has the changes you want and choose cherry-pick.
In the future, you should follow Kaz's advice: if you are going to want to keep your changes separate from others' changes, you should commit them into a separate, local-only branch. Your team might want to consider using the git flow development model:
SourceTree even has directly integrated a git plugin to facilitate git flow. Make sure you understand it before you try to use it, though.
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot