I just started using Git for a personal project. Today I made some changes to a file. The changes included some needed fixes, but also introduced new bugs, so I committed the changes on a new branch.
I want to merge the fixes back into the master branch, but keep the other stuff out. Git merge doesn't see conflicts between the files, so it simply merges all of the changes in. If I try to use git diff, it gives me the option to use vimdiff, which I don't know the first thing about. I tried to set up Winmerge as my diff tool in gitconfig as instructed here
, but Winmerge gives me "file not found" errors when it launches.
Right now all I can think of is to download the branched file from github, merge it with the master manually, and commit those changes on master. I feel like I shouldn't need to use that kind of workaround in a version control
I'm running Windows 10.
The GOP cares about babies until they're born, soldiers until they're in need of care, and families until they interfere with stockholder dividends.