Disabling automatic add after resolving git conflictHow to start ediff-ing a file that has git conflict...
What is the best delay to use between characters sent to the serial port
Do sudoku answers always have a single minimal clue set?
“Transitive verb” + interrupter+ “object”?
Does ultrasonic bath cleaning damage laboratory volumetric glassware calibration?
Dold-Kan correspondence in the category of symmetric spectra
Difference between 'demás' and 'otros'?
Intuitively, why does putting capacitors in series decrease the equivalent capacitance?
MH370 blackbox - is it still possible to retrieve data from it?
Transitive action of a discrete group on a compact space
Going to get married soon, should I do it on Dec 31 or Jan 1?
Do 3D printers really reach 50 micron (0.050mm) accuracy?
Forgot chonantanu after already making havdalah over wine
What happens when your group is victim of a surprise attack but you can't be surprised?
Is there any set of 2-6 notes that doesn't have a chord name?
Signing using digital signatures?
Generate and graph the Recamán Sequence
How to write or read powers (math) by words?
Why is Madam Hooch not a professor?
Did Chinese school textbook maps (c. 1951) "depict China as stretching even into the central Asian republics"?
Can you get infinite turns with this 2 card combo?
Is this the golf ball that Alan Shepard hit on the Moon?
Was touching your nose a greeting in second millenium Mesopotamia?
When is it ok to add filler to a story?
How was film developed in the late 1920s?
Disabling automatic add after resolving git conflict
How to start ediff-ing a file that has git conflict markers in it?Automatically quit emacs after git-commit-commit in git-commit modeAuto refresh buffer upon git checkoutWhat's the Magit equivalent of 'git add'?How to merge Git conflicts in EmacsGit commit uses fundamental mode after magit updatePackage manager: which files not to add to git?How do I do a `git add` with vc-git?Git commit line length constraintsShow Git gutter after linenumbers
.everyoneloves__top-leaderboard:empty,.everyoneloves__mid-leaderboard:empty,.everyoneloves__bot-mid-leaderboard:empty{ margin-bottom:0;
}
After updating emacs (to 25.2.2 as shipping in ubuntu 18.04) I notice a change that completely breaks my conflict resolution flow in git. Once I resolve a conflict using emacs and save the file, emacs automatically does "git add" on the file. This may seem convenient but it removes the chance to see the resulting "3-way conflict diff" (I have no idea what this is really called in git speak).
Is there a way to disable this auto-add of the resolved file? I have tried disabling smerge-mode in the buffer before saving but that does not seem to help. I can't even figure out which mode is doing the actual auto-add either.
On further investigation the problematic behaviour seems to be caused by the vc-git-resolve-when-done hook. So the question seems to be how to disable this after-save-hook.
git vc-mode
asked 11 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
add a comment |
After updating emacs (to 25.2.2 as shipping in ubuntu 18.04) I notice a change that completely breaks my conflict resolution flow in git. Once I resolve a conflict using emacs and save the file, emacs automatically does "git add" on the file. This may seem convenient but it removes the chance to see the resulting "3-way conflict diff" (I have no idea what this is really called in git speak).
Is there a way to disable this auto-add of the resolved file? I have tried disabling smerge-mode in the buffer before saving but that does not seem to help. I can't even figure out which mode is doing the actual auto-add either.
On further investigation the problematic behaviour seems to be caused by the vc-git-resolve-when-done hook. So the question seems to be how to disable this after-save-hook.
git vc-mode
asked 11 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
You should make your comment an answer and then accept it. That marks the question as "answered" and helps future visitors when they search.
– NickD
8 hours ago
add a comment |
After updating emacs (to 25.2.2 as shipping in ubuntu 18.04) I notice a change that completely breaks my conflict resolution flow in git. Once I resolve a conflict using emacs and save the file, emacs automatically does "git add" on the file. This may seem convenient but it removes the chance to see the resulting "3-way conflict diff" (I have no idea what this is really called in git speak).
Is there a way to disable this auto-add of the resolved file? I have tried disabling smerge-mode in the buffer before saving but that does not seem to help. I can't even figure out which mode is doing the actual auto-add either.
On further investigation the problematic behaviour seems to be caused by the vc-git-resolve-when-done hook. So the question seems to be how to disable this after-save-hook.
git vc-mode
asked 11 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
After updating emacs (to 25.2.2 as shipping in ubuntu 18.04) I notice a change that completely breaks my conflict resolution flow in git. Once I resolve a conflict using emacs and save the file, emacs automatically does "git add" on the file. This may seem convenient but it removes the chance to see the resulting "3-way conflict diff" (I have no idea what this is really called in git speak).
Is there a way to disable this auto-add of the resolved file? I have tried disabling smerge-mode in the buffer before saving but that does not seem to help. I can't even figure out which mode is doing the actual auto-add either.
On further investigation the problematic behaviour seems to be caused by the vc-git-resolve-when-done hook. So the question seems to be how to disable this after-save-hook.
git vc-mode
git vc-mode
asked 11 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
asked 11 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
edited 11 hours ago
miffo
asked 11 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
asked 11 hours ago
miffomiffo
413 bronze badges
asked 11 hours ago
miffomiffo
413 bronze badges
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
You should make your comment an answer and then accept it. That marks the question as "answered" and helps future visitors when they search.
– NickD
8 hours ago
add a comment |
You should make your comment an answer and then accept it. That marks the question as "answered" and helps future visitors when they search.
– NickD
8 hours ago
You should make your comment an answer and then accept it. That marks the question as "answered" and helps future visitors when they search.
– NickD
8 hours ago
You should make your comment an answer and then accept it. That marks the question as "answered" and helps future visitors when they search.
– NickD
8 hours ago
add a comment |
1 Answer
1
active
oldest
votes
This behaviour is controlled by the vc-git-resolve-conflicts variable. Setting this to nil removes automatic git-add after conflict resolution.
answered 4 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
add a comment |
Your Answer
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "583"
};
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
});
}
});
miffo is a new contributor. Be nice, and check out our Code of Conduct.
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%2femacs.stackexchange.com%2fquestions%2f51206%2fdisabling-automatic-add-after-resolving-git-conflict%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
This behaviour is controlled by the vc-git-resolve-conflicts variable. Setting this to nil removes automatic git-add after conflict resolution.
answered 4 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
add a comment |
This behaviour is controlled by the vc-git-resolve-conflicts variable. Setting this to nil removes automatic git-add after conflict resolution.
answered 4 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
add a comment |
This behaviour is controlled by the vc-git-resolve-conflicts variable. Setting this to nil removes automatic git-add after conflict resolution.
answered 4 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
This behaviour is controlled by the vc-git-resolve-conflicts variable. Setting this to nil removes automatic git-add after conflict resolution.
answered 4 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
edited 4 hours ago
answered 4 hours ago
miffomiffo
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
answered 4 hours ago
miffomiffo
413 bronze badges
answered 4 hours ago
miffomiffo
413 bronze badges
413 bronze badges
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
New contributor
miffo is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
add a comment |
add a comment |
miffo is a new contributor. Be nice, and check out our Code of Conduct.
miffo is a new contributor. Be nice, and check out our Code of Conduct.
miffo is a new contributor. Be nice, and check out our Code of Conduct.
miffo is a new contributor. Be nice, and check out our Code of Conduct.
Thanks for contributing an answer to Emacs 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.
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%2femacs.stackexchange.com%2fquestions%2f51206%2fdisabling-automatic-add-after-resolving-git-conflict%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
You should make your comment an answer and then accept it. That marks the question as "answered" and helps future visitors when they search.
– NickD
8 hours ago