I have recently started trying to use Git hub for some of my Visual Studio projects.
I seem to have somehow messed up my solution because I cannot compile due to this errror:
How can I correct this? and how can I prevent this from happening again?
I have recently started trying to use Git hub for some of my Visual Studio projects.
I seem to have somehow messed up my solution because I cannot compile due to this errror:
How can I correct this? and how can I prevent this from happening again?
It looks like you've experienced your first conflict in a version control system. At least some VCSs like Git and SVN use what are called "conflict markers" in files where they couldn't figure out how to resolve the conflicts automatically, and require manual user conflict resolution.
I encourage you to read about how you can resolve conflicts in Git from the Basic Merge Conflicts section of the FREE online Pro Git book. You can also read about resolving conflicts in Git in these other Stack Overflow answers:
I also highly encourage you to just learn more about how to use Git in general by reading chapters 1-3 and 6-6.5 of the Pro Git book. It will help you a lot with learning how to become really great at using Git.
Have you tried rolling back to a previous commit? before the error started occurring?
Follow the answer in this question: How do you roll back (reset) a Git repository to a particular commit?