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
Does pushing and pulling result in a merge (and thus the possibility of merge conflicts?)?
Steven Parker228,001 Points
A merge (and possible merge conflict) should only occur if you have made changes at the same time that someone else has, and they have already pushed their code to the shared repo.
If you're the only one making changes, you should never have a merge.