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 Merging Merge Conflicts

Rachelle Wood
Rachelle Wood
15,362 Points
Posted by Rachelle Wood
Rachelle Wood
15,362 Points

Conflict Merging with Text Files in Windows Version of Git

I don't get the same output that the instructor gets after trying to merge the conflicting file1 versions. I have Git for Windows so I have to use notepad rather than nano. I did not get any conflict markers at all in my conflicting text files.

Is there a way to get the conflict markers with notepad? If not, how would you know where the conflicts are in much larger projects with lots of text files if you use a Window machines barring installing a Linux shell and using Git for Linux?

Thomas Lian Ødegaard
Thomas Lian Ødegaard
9,540 Points
Thomas Lian Ødegaard
Thomas Lian Ødegaard
9,540 Points

I do use notepad and windows 10 with git. And i did get the conflict markers in my code, exactly like the ones in the video. Maybe you should watch the video one more time, and try again.

Remember to commit in both master and foo_feature

Rachelle Wood
Rachelle Wood
15,362 Points
Rachelle Wood
Rachelle Wood
15,362 Points

I did. I checked everything, and rechecked everything. I couldn't get conflict markers with this one but got them in later steps of the course. Really weird.

Aaron Coursolle
Aaron Coursolle
18,014 Points
Aaron Coursolle
Aaron Coursolle
18,014 Points

I had the same problem, at first, when using nano. Basically, it made changes to the file that were reflected on both branches. Even when switching from one branch to another, to confirm it. However, it was a glitch that eventually just fixed itself.

Robert Leonardi
Robert Leonardi
17,151 Points
Robert Leonardi
Robert Leonardi
17,151 Points

rachel

  1. try using vim instead
  2. before merging, at its own branch, have u done the git commit ? that' might be the reason it didn't conflict. after the git commit each, also check out the log, making sure each branch has different end log.... THEN u try merging.. u should get a conflict