Unnecessary merge conflicts

[matthewcburke]

A summary:

As I was learning how to use git and github, it took me a while to get the right mix of files in the .gitignore file. Lately, we haven't been ignoring any files, but this was causing confusing merge conflicts with generated files when we hadn't even modified our code.

Where we are now:

I think I have it figured out. The .gitignore now includes a number of generated files (check it out), and I have removed those files from the repository so they are no longer being tracked.

What it means to you:

Next time you merge with the remote develop branch you will likely get merge conflicts with files in the samples/ImageTargets/obj/ folder. I have deleted them, and they are modified on you local repository. The automatic merge will fail, and you'll be tasked with sorting the problem out manually. You should remove conflicting files in the obj/ directory from your local git repository. To do this from the command line, go to your ImageTargets/ folder and enter git rm -r --cached obj/. This will remove said files recursively from the git repository, but leave them in the working tree (they are still there, but not tracked).

Hopefully this works. Everyone give it a try, and we can trouble shoot any challenges at our Monday meeting.

[ejamroz]

Thank you for the detailed explanation. I am pulling and pushing just fine without the need of the command git rm -r --cached obj/, in fact no obj directory even exists anymore once you pull the most current version, so there should not longer be any problems. Nice work Matt.