Club PA 2.0 has arrived! If you'd like to access some extra PA content and help support the forums, check it out at patreon.com/ClubPA
The image size limit has been raised to 1mb! Anything larger than that should be linked to. This is a HARD limit, please do not abuse it.
Our new Indie Games subforum is now open for business in G&T. Go and check it out, you might land a code for a free game. If you're developing an indie game and want to post about it, follow these directions
. If you don't, he'll break your legs! Hahaha! Seriously though.
Our rules have been updated and given their own forum
. Go and look at them! They are nice, and there may be new ones that you didn't know about! Hooray for rules! Hooray for The System! Hooray for Conforming!
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.