Why did this not do what I was expecting--namely, combine his changes with mine? How should I/we proceed in the future to avoid this? Is there an option I should have set to avoid this?
grrr....later I'll ask how I can fix it....
I see this time and time again from beginner coders and lead coders alike. You don't want to and usually can't avoid merge conflicts and it isn't really that much of a big deal if you get them anyway.
To do a merge I go through this process:
- Check my files (Or hunks) for changes not needed or unintended changes and reset them
- Pull and merge
- Fix any conflicts using a diff tool. (SourceTree on Mac shows differences and I just use that + monodevelop) I don't have a recommended for Windows
- Commit \ push merge