I'm using SourceTree and would like to merge a commit from staging back to master. However, there are a few files in the commit that shouldn't be merged. I can't see where SourceTree allows me to mark the files to not merge.
How can I do this? I'd like it to be a permanent marking, so I don't accidentally merge them in the future.
Git does not allow you to select specific files that should be part of the merge, it is all or nothing. What you can do is create a new branch, check it out, and then use
git checkout source_branch <file_path> ...
The source branch is your staging and then specify the files that you want to merge into master. Once done, merge the branch with master and you should be all set.
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...
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
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs