Welcome to the Treehouse Community

Want to collaborate on code errors? Have bugs you need feedback on? Looking for an extra set of eyes on your latest project? Get support with fellow developers, designers, and programmers of all backgrounds and skill levels here with the Treehouse Community!

Looking to learn something new?

Treehouse offers a seven day free trial for new students. Get access to thousands of hours of content and join thousands of Treehouse students and alumni in the community today.

Start your free trial

Development Tools

Viewing GIT resolution errors.

After GIT resolves errors, is there a way (i.e. command) that I can use to see what GIT resolved in a list? I'm thinking of situations of where there could have been a lot of conflicts in a merge that would be resolved, it would just be nice as a QC task.

1 Answer

Try running the git merge with --stat and/or --verbose?