How to exit Git MERGE_MSG?
I was trying to merge two Git branches but I got an error ("fatal: refusing to merge unrelated histories"), so then I checked and I saw some advices here to try and force the merge, but then this screen shows on my terminal (MERGE_MSG), and I cannot do anything on it, cannot put in any command like in vim. So basically I cannot go back to my terminal, because I cannot exit this MERGE_MSG.
git merge github
edited Dec 17 at 19:47
Rui F Ribeiro
39k1479129
asked Dec 17 at 19:40
Zalachenka
1
add a comment |
I was trying to merge two Git branches but I got an error ("fatal: refusing to merge unrelated histories"), so then I checked and I saw some advices here to try and force the merge, but then this screen shows on my terminal (MERGE_MSG), and I cannot do anything on it, cannot put in any command like in vim. So basically I cannot go back to my terminal, because I cannot exit this MERGE_MSG.
git merge github
edited Dec 17 at 19:47
Rui F Ribeiro
39k1479129
asked Dec 17 at 19:40
Zalachenka
1
Doesn't ctrl + q alow you to leave git?
– vfbsilva
Dec 17 at 19:55
How are you "forcing" the merge? Why do you think that merging unrelated histories is going to work?
– Jules
Dec 17 at 19:56
@vfbsilva it does open a "Search", but there is no exit command to it.
– Zalachenka
Dec 17 at 20:05
@Jules I just read something online about it; stackoverflow.com/questions/37937984/…
– Zalachenka
Dec 17 at 20:06
add a comment |
I was trying to merge two Git branches but I got an error ("fatal: refusing to merge unrelated histories"), so then I checked and I saw some advices here to try and force the merge, but then this screen shows on my terminal (MERGE_MSG), and I cannot do anything on it, cannot put in any command like in vim. So basically I cannot go back to my terminal, because I cannot exit this MERGE_MSG.
git merge github
edited Dec 17 at 19:47
Rui F Ribeiro
39k1479129
asked Dec 17 at 19:40
Zalachenka
1
I was trying to merge two Git branches but I got an error ("fatal: refusing to merge unrelated histories"), so then I checked and I saw some advices here to try and force the merge, but then this screen shows on my terminal (MERGE_MSG), and I cannot do anything on it, cannot put in any command like in vim. So basically I cannot go back to my terminal, because I cannot exit this MERGE_MSG.
git merge github
git merge github
edited Dec 17 at 19:47
Rui F Ribeiro
39k1479129
asked Dec 17 at 19:40
Zalachenka
1
edited Dec 17 at 19:47
Rui F Ribeiro
39k1479129
asked Dec 17 at 19:40
Zalachenka
1
edited Dec 17 at 19:47
Rui F Ribeiro
39k1479129
edited Dec 17 at 19:47
Rui F Ribeiro
39k1479129
edited Dec 17 at 19:47
Rui F Ribeiro
39k1479129
39k1479129
asked Dec 17 at 19:40
Zalachenka
1
asked Dec 17 at 19:40
Zalachenka
1
asked Dec 17 at 19:40
Zalachenka
1
1
Doesn't ctrl + q alow you to leave git?
– vfbsilva
Dec 17 at 19:55
How are you "forcing" the merge? Why do you think that merging unrelated histories is going to work?
– Jules
Dec 17 at 19:56
@vfbsilva it does open a "Search", but there is no exit command to it.
– Zalachenka
Dec 17 at 20:05
@Jules I just read something online about it; stackoverflow.com/questions/37937984/…
– Zalachenka
Dec 17 at 20:06
add a comment |
Doesn't ctrl + q alow you to leave git?
– vfbsilva
Dec 17 at 19:55
How are you "forcing" the merge? Why do you think that merging unrelated histories is going to work?
– Jules
Dec 17 at 19:56
@vfbsilva it does open a "Search", but there is no exit command to it.
– Zalachenka
Dec 17 at 20:05
@Jules I just read something online about it; stackoverflow.com/questions/37937984/…
– Zalachenka
Dec 17 at 20:06
Doesn't ctrl + q alow you to leave git?
– vfbsilva
Dec 17 at 19:55
Doesn't ctrl + q alow you to leave git?
– vfbsilva
Dec 17 at 19:55
How are you "forcing" the merge? Why do you think that merging unrelated histories is going to work?
– Jules
Dec 17 at 19:56
How are you "forcing" the merge? Why do you think that merging unrelated histories is going to work?
– Jules
Dec 17 at 19:56
@vfbsilva it does open a "Search", but there is no exit command to it.
– Zalachenka
Dec 17 at 20:05
@vfbsilva it does open a "Search", but there is no exit command to it.
– Zalachenka
Dec 17 at 20:05
@Jules I just read something online about it; stackoverflow.com/questions/37937984/…
– Zalachenka
Dec 17 at 20:06
@Jules I just read something online about it; stackoverflow.com/questions/37937984/…
– Zalachenka
Dec 17 at 20:06
add a comment |
active
oldest
votes
Your Answer
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "106"
};
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function() {
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled) {
StackExchange.using("snippets", function() {
createEditor();
});
}
else {
createEditor();
}
});
function createEditor() {
StackExchange.prepareEditor({
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: false,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: null,
bindNavPrevention: true,
postfix: "",
imageUploader: {
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
},
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
});
}
});
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2funix.stackexchange.com%2fquestions%2f489554%2fhow-to-exit-git-merge-msg%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
active
oldest
votes
active
oldest
votes
active
oldest
votes
active
oldest
votes
Thanks for contributing an answer to Unix & Linux Stack Exchange!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Some of your past answers have not been well-received, and you're in danger of being blocked from answering.
Please pay close attention to the following guidance:
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2funix.stackexchange.com%2fquestions%2f489554%2fhow-to-exit-git-merge-msg%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Doesn't ctrl + q alow you to leave git?
– vfbsilva
Dec 17 at 19:55
How are you "forcing" the merge? Why do you think that merging unrelated histories is going to work?
– Jules
Dec 17 at 19:56
@vfbsilva it does open a "Search", but there is no exit command to it.
– Zalachenka
Dec 17 at 20:05
@Jules I just read something online about it; stackoverflow.com/questions/37937984/…
– Zalachenka
Dec 17 at 20:06