[QUOTE=Wrangler] I've been having a lot of issues with GitHub for Windows and Construct 2. I'm guessing that a lot of it is down to me not knowing how to properly use it, but I'll explain what issues I'm having:This
is the method I've been following, along with the other guy in my team. We've got our main development branch, and both have our own branches for stuff we're working on. When we try and merge a branch into the main Development branch, it complains about conflicting files and refuses to merge.
Are we supposed to avoid working on say, the same layout, at the same time? It just doesn't seem to ring true to what I expected Git to work like.[/QUOTE]
It is all text at the end of the day, so merging shouldn't be an issue. You might be running into issues because you are doing a baseless merge, it doesn't know the state of your changes in comparison to your team members. You should be working on one dev branch. I am not sure I fully understand using 2 personal branches and then merging into those, and then merging into the dev branch.
Some of his suggestions I disagree with as well, such as the following.
What happens if a bug is found in production? He suggests: "My general process for handling this involves the following
Make the fix directly on master
Tag it as a patch release
Push up the change
Merge the change into development"