Resolved git merge conflict in VS Code, but still says unresolved
up vote
9
down vote
favorite
So I have a develop branch and topic branch. I'm using the default Terminal in Window's VS Code. While in the topic branch, I did git merge develop since I just got latest on develop branch. Now there's a simple merge conflict in one file. In VS Code, I resolved the conflict. On the code page, there's no more conflicts that you can Accept Incoming or Accept Current, but when I try to stage the file on the Source Control panel on the left, it shows a warning popup saying Are you sure you want to stage with merge conflicts?
Is this normal? it seems like VS Code doesn't think I resolved the conflict even tho I just did, and there's no more conflict in the file. Or is there something I'm missing Git/VS Code-wise?
git merge visual-studio-code merge-conflict-resolution
asked Sep 29 '17 at 18:04
midnightnoir
1311111
|
show 2 more comments
up vote
9
down vote
favorite
So I have a develop branch and topic branch. I'm using the default Terminal in Window's VS Code. While in the topic branch, I did git merge develop since I just got latest on develop branch. Now there's a simple merge conflict in one file. In VS Code, I resolved the conflict. On the code page, there's no more conflicts that you can Accept Incoming or Accept Current, but when I try to stage the file on the Source Control panel on the left, it shows a warning popup saying Are you sure you want to stage with merge conflicts?
Is this normal? it seems like VS Code doesn't think I resolved the conflict even tho I just did, and there's no more conflict in the file. Or is there something I'm missing Git/VS Code-wise?
git merge visual-studio-code merge-conflict-resolution
asked Sep 29 '17 at 18:04
midnightnoir
1311111
2
Did you do agit add <file>after resolving the conflict?
– Ammar Husain
Sep 29 '17 at 18:06
That's what I'm trying to do, isn'tgit add <file>the same as staging a file?
– midnightnoir
Sep 29 '17 at 18:07
1
Make sure that conflict markers are not in the file. <<<<<<< HEAD
– Shashwat Kumar
Sep 29 '17 at 18:09
1
open the file and search for this string.
– Shashwat Kumar
Sep 29 '17 at 21:02
1
This is an open issue in VSCode from version 1.16.0 github.com/Microsoft/vscode/issues/33983
– Islam El-Khayat
Oct 3 '17 at 20:00
|
show 2 more comments
up vote
9
down vote
favorite
up vote
9
down vote
favorite
So I have a develop branch and topic branch. I'm using the default Terminal in Window's VS Code. While in the topic branch, I did git merge develop since I just got latest on develop branch. Now there's a simple merge conflict in one file. In VS Code, I resolved the conflict. On the code page, there's no more conflicts that you can Accept Incoming or Accept Current, but when I try to stage the file on the Source Control panel on the left, it shows a warning popup saying Are you sure you want to stage with merge conflicts?
Is this normal? it seems like VS Code doesn't think I resolved the conflict even tho I just did, and there's no more conflict in the file. Or is there something I'm missing Git/VS Code-wise?
git merge visual-studio-code merge-conflict-resolution
asked Sep 29 '17 at 18:04
midnightnoir
1311111
So I have a develop branch and topic branch. I'm using the default Terminal in Window's VS Code. While in the topic branch, I did git merge develop since I just got latest on develop branch. Now there's a simple merge conflict in one file. In VS Code, I resolved the conflict. On the code page, there's no more conflicts that you can Accept Incoming or Accept Current, but when I try to stage the file on the Source Control panel on the left, it shows a warning popup saying Are you sure you want to stage with merge conflicts?
Is this normal? it seems like VS Code doesn't think I resolved the conflict even tho I just did, and there's no more conflict in the file. Or is there something I'm missing Git/VS Code-wise?
git merge visual-studio-code merge-conflict-resolution
git merge visual-studio-code merge-conflict-resolution
asked Sep 29 '17 at 18:04
midnightnoir
1311111
asked Sep 29 '17 at 18:04
midnightnoir
1311111
edited Sep 29 '17 at 18:06
asked Sep 29 '17 at 18:04
midnightnoir
1311111
asked Sep 29 '17 at 18:04
midnightnoir
1311111
asked Sep 29 '17 at 18:04
midnightnoir
1311111
1311111
2
Did you do agit add <file>after resolving the conflict?
– Ammar Husain
Sep 29 '17 at 18:06
That's what I'm trying to do, isn'tgit add <file>the same as staging a file?
– midnightnoir
Sep 29 '17 at 18:07
1
Make sure that conflict markers are not in the file. <<<<<<< HEAD
– Shashwat Kumar
Sep 29 '17 at 18:09
1
open the file and search for this string.
– Shashwat Kumar
Sep 29 '17 at 21:02
1
This is an open issue in VSCode from version 1.16.0 github.com/Microsoft/vscode/issues/33983
– Islam El-Khayat
Oct 3 '17 at 20:00
|
show 2 more comments
2
Did you do agit add <file>after resolving the conflict?
– Ammar Husain
Sep 29 '17 at 18:06
That's what I'm trying to do, isn'tgit add <file>the same as staging a file?
– midnightnoir
Sep 29 '17 at 18:07
1
Make sure that conflict markers are not in the file. <<<<<<< HEAD
– Shashwat Kumar
Sep 29 '17 at 18:09
1
open the file and search for this string.
– Shashwat Kumar
Sep 29 '17 at 21:02
1
This is an open issue in VSCode from version 1.16.0 github.com/Microsoft/vscode/issues/33983
– Islam El-Khayat
Oct 3 '17 at 20:00
2
2
Did you do a
git add <file> after resolving the conflict?– Ammar Husain
Sep 29 '17 at 18:06
Did you do a
git add <file> after resolving the conflict?– Ammar Husain
Sep 29 '17 at 18:06
That's what I'm trying to do, isn't
git add <file> the same as staging a file?– midnightnoir
Sep 29 '17 at 18:07
That's what I'm trying to do, isn't
git add <file> the same as staging a file?– midnightnoir
Sep 29 '17 at 18:07
1
1
Make sure that conflict markers are not in the file. <<<<<<< HEAD
– Shashwat Kumar
Sep 29 '17 at 18:09
Make sure that conflict markers are not in the file. <<<<<<< HEAD
– Shashwat Kumar
Sep 29 '17 at 18:09
1
1
open the file and search for this string.
– Shashwat Kumar
Sep 29 '17 at 21:02
open the file and search for this string.
– Shashwat Kumar
Sep 29 '17 at 21:02
1
1
This is an open issue in VSCode from version 1.16.0 github.com/Microsoft/vscode/issues/33983
– Islam El-Khayat
Oct 3 '17 at 20:00
This is an open issue in VSCode from version 1.16.0 github.com/Microsoft/vscode/issues/33983
– Islam El-Khayat
Oct 3 '17 at 20:00
|
show 2 more comments
1 Answer
1
active
oldest
votes
up vote
0
down vote
In VSCode when you have conflicts in multiple files, they're shown in the git panel and you can open files one by one and resolve them.
When you resolve the conflicts in a file, you should save the file then click the + button of that file (shown in the image bellow).
This will result in staging the file. If you click this button and there's unresolved conflicts in that file, you'll get this message:
Are you sure you want to stage with merge conflicts?
Now if you resolve conflicts of all files and click on the + button that is above all files (to stage all files with conflict) (Shown in the image bellow), it'll still give you the same message (Although you've already resolved all conflicts).
So I recommend that you click the + of each file individually so that you'll be sure that you resolved all conflicts before staging the file.
Note
I believe this bug is fixed in recent versions of VSCode.
answered Nov 12 at 18:00
vmoh_ir
1,3161424
add a comment |
Your Answer
StackExchange.ifUsing("editor", function () {
StackExchange.using("externalEditor", function () {
StackExchange.using("snippets", function () {
StackExchange.snippets.init();
});
});
}, "code-snippets");
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "1"
};
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: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
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%2fstackoverflow.com%2fquestions%2f46494615%2fresolved-git-merge-conflict-in-vs-code-but-still-says-unresolved%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
up vote
0
down vote
In VSCode when you have conflicts in multiple files, they're shown in the git panel and you can open files one by one and resolve them.
When you resolve the conflicts in a file, you should save the file then click the + button of that file (shown in the image bellow).
This will result in staging the file. If you click this button and there's unresolved conflicts in that file, you'll get this message:
Are you sure you want to stage with merge conflicts?
Now if you resolve conflicts of all files and click on the + button that is above all files (to stage all files with conflict) (Shown in the image bellow), it'll still give you the same message (Although you've already resolved all conflicts).
So I recommend that you click the + of each file individually so that you'll be sure that you resolved all conflicts before staging the file.
Note
I believe this bug is fixed in recent versions of VSCode.
answered Nov 12 at 18:00
vmoh_ir
1,3161424
add a comment |
up vote
0
down vote
In VSCode when you have conflicts in multiple files, they're shown in the git panel and you can open files one by one and resolve them.
When you resolve the conflicts in a file, you should save the file then click the + button of that file (shown in the image bellow).
This will result in staging the file. If you click this button and there's unresolved conflicts in that file, you'll get this message:
Are you sure you want to stage with merge conflicts?
Now if you resolve conflicts of all files and click on the + button that is above all files (to stage all files with conflict) (Shown in the image bellow), it'll still give you the same message (Although you've already resolved all conflicts).
So I recommend that you click the + of each file individually so that you'll be sure that you resolved all conflicts before staging the file.
Note
I believe this bug is fixed in recent versions of VSCode.
answered Nov 12 at 18:00
vmoh_ir
1,3161424
add a comment |
up vote
0
down vote
up vote
0
down vote
In VSCode when you have conflicts in multiple files, they're shown in the git panel and you can open files one by one and resolve them.
When you resolve the conflicts in a file, you should save the file then click the + button of that file (shown in the image bellow).
This will result in staging the file. If you click this button and there's unresolved conflicts in that file, you'll get this message:
Are you sure you want to stage with merge conflicts?
Now if you resolve conflicts of all files and click on the + button that is above all files (to stage all files with conflict) (Shown in the image bellow), it'll still give you the same message (Although you've already resolved all conflicts).
So I recommend that you click the + of each file individually so that you'll be sure that you resolved all conflicts before staging the file.
Note
I believe this bug is fixed in recent versions of VSCode.
answered Nov 12 at 18:00
vmoh_ir
1,3161424
In VSCode when you have conflicts in multiple files, they're shown in the git panel and you can open files one by one and resolve them.
When you resolve the conflicts in a file, you should save the file then click the + button of that file (shown in the image bellow).
This will result in staging the file. If you click this button and there's unresolved conflicts in that file, you'll get this message:
Are you sure you want to stage with merge conflicts?
Now if you resolve conflicts of all files and click on the + button that is above all files (to stage all files with conflict) (Shown in the image bellow), it'll still give you the same message (Although you've already resolved all conflicts).
So I recommend that you click the + of each file individually so that you'll be sure that you resolved all conflicts before staging the file.
Note
I believe this bug is fixed in recent versions of VSCode.
answered Nov 12 at 18:00
vmoh_ir
1,3161424
edited Nov 12 at 18:12
answered Nov 12 at 18:00
vmoh_ir
1,3161424
answered Nov 12 at 18:00
vmoh_ir
1,3161424
answered Nov 12 at 18:00
vmoh_ir
1,3161424
1,3161424
add a comment |
add a comment |
Thanks for contributing an answer to Stack Overflow!
- 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%2fstackoverflow.com%2fquestions%2f46494615%2fresolved-git-merge-conflict-in-vs-code-but-still-says-unresolved%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
2
Did you do a
git add <file>after resolving the conflict?– Ammar Husain
Sep 29 '17 at 18:06
That's what I'm trying to do, isn't
git add <file>the same as staging a file?– midnightnoir
Sep 29 '17 at 18:07
1
Make sure that conflict markers are not in the file. <<<<<<< HEAD
– Shashwat Kumar
Sep 29 '17 at 18:09
1
open the file and search for this string.
– Shashwat Kumar
Sep 29 '17 at 21:02
1
This is an open issue in VSCode from version 1.16.0 github.com/Microsoft/vscode/issues/33983
– Islam El-Khayat
Oct 3 '17 at 20:00