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

Mayur Pande
Mayur Pande
Courses Plus Student 11,711 Points

Git Extra Credit - Merging

So on the second part to the extra credit of the merging section (Selfish Merging) in the Git basics course it says;

"Sometimes when you merge, you don't want to be clever about handling merge conflicts - for example, if you're working on a new redesign of a website, for example, you probably don't care about any changes that were made to the current design recently. In that case, whenever you ran a git merge, you might want to try to automatically just preserve your set of changes whenever there's a conflict. Does git provide a way for you to do that? If so, what situations can you think of where it would be a good idea? Can you think of any situations where it could be harmful?"

I found this question on the forum but I still don't really get it.

Surely if you have a branch with a file in it that you make some changes to and merge that with another branch. The conflict will not affect the the branch with the file that you make some changes to? Therefore preserving the changes that you did?

I am not sure I am right in thinking about this. Please correct me if I am wrong