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! While you're at it, check out some resources Treehouse students have shared here.

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 Git Basics Working With Remote Repositories Pushing and Pulling

Mathew Kurian
Mathew Kurian
4,698 Points
Posted by Mathew Kurian
Mathew Kurian
4,698 Points

Different Method for Handling Merge Conflicts

When handling a merge conflict can we add the changes through a "git commit -am " or do we have to do a "git add" followed by a "git commit"?

Kenan Xin
Kenan Xin
16,139 Points
Kenan Xin
Kenan Xin
16,139 Points

both of them does the same thing if im not wrong