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

Elinor Armsby
Elinor Armsby
13,987 Points
Posted by Elinor Armsby
Elinor Armsby
13,987 Points

What does the instructor press to type to exit out of the merge conflict screen around 5:44?

I am stuck in the merge commit message screen after following steps to add file to staging and then run git commit. My screen looks mostly the same as the video but he presses something to exit and I can't find any key that gets me out of the screen.

3 Answers

Elinor Armsby
Elinor Armsby
13,987 Points
Elinor Armsby
Elinor Armsby
13,987 Points

I tried control x and that didn't work. So I googled and found that you have to type ":q" to exit. It was hard to see where I could even type it but I found it eventually. :)

Steven Parker
Steven Parker
231,275 Points
Steven Parker
Steven Parker
231,275 Points

I would expect he types Ctrl-X. It is shown in the menu at the bottom of the screen (^X) as the shortcut for "Exit".

Elinor Armsby
Elinor Armsby
13,987 Points
Elinor Armsby
Elinor Armsby
13,987 Points

Hmm... I thought I tried that but I'll try that again next time. I ended up just closing out of the whole app and restarting it. Thanks for the suggestion