Git merge showing file delete when it was modified
I'm trying to do a merge from a development branch 'update' into the 'dev' branch. The 'update' is several commits ahead of dev, and there is potential for conflicts. So I'm merging in 'update' commits one at a time, starting with the first commit after the last dev/update split. So we have dev, branch to update, then N commits, and I'm trying to get just commit 1 back into dev to start.
I'm very confused about why Git is reporting one of the files modified in this first commit as being deleted. It would be bold to claim this is a bug, so I'm assuming I don't understand what's happening, and I'm hoping someone can educate me. Thanks!
(In screenshots, irrelevant detail removed for focus, and I'm referring to commits simply by the first two digits of their SHA hash.)
In these images it seems obvious from the first screenshot of merge conflict resolution, that in the dev branch the 8k file RMD.SETUP.ACCOUNT was modified in commit 5e to 10k.
In the second image, it's confirmed that the commit also sees this as a delete. (I didn't actually commit that, I cancelled. This is what would be commited after the merge.)
To verify that nothing happened between the branch of dev to update and the 5e commit, here is a snapshot of the commit message for the current dev branch, commit 30. It shows the last update includes commit 9a and a2. So the progression in dev is a2 > 9a > 30.
This screenshot shows all branches, and 5e is the first after 30.
git tortoise-git
asked Jan 12 at 23:39
TonyGTonyG
1237
add a comment |
I'm trying to do a merge from a development branch 'update' into the 'dev' branch. The 'update' is several commits ahead of dev, and there is potential for conflicts. So I'm merging in 'update' commits one at a time, starting with the first commit after the last dev/update split. So we have dev, branch to update, then N commits, and I'm trying to get just commit 1 back into dev to start.
I'm very confused about why Git is reporting one of the files modified in this first commit as being deleted. It would be bold to claim this is a bug, so I'm assuming I don't understand what's happening, and I'm hoping someone can educate me. Thanks!
(In screenshots, irrelevant detail removed for focus, and I'm referring to commits simply by the first two digits of their SHA hash.)
In these images it seems obvious from the first screenshot of merge conflict resolution, that in the dev branch the 8k file RMD.SETUP.ACCOUNT was modified in commit 5e to 10k.
In the second image, it's confirmed that the commit also sees this as a delete. (I didn't actually commit that, I cancelled. This is what would be commited after the merge.)
To verify that nothing happened between the branch of dev to update and the 5e commit, here is a snapshot of the commit message for the current dev branch, commit 30. It shows the last update includes commit 9a and a2. So the progression in dev is a2 > 9a > 30.
This screenshot shows all branches, and 5e is the first after 30.
git tortoise-git
asked Jan 12 at 23:39
TonyGTonyG
1237
add a comment |
I'm trying to do a merge from a development branch 'update' into the 'dev' branch. The 'update' is several commits ahead of dev, and there is potential for conflicts. So I'm merging in 'update' commits one at a time, starting with the first commit after the last dev/update split. So we have dev, branch to update, then N commits, and I'm trying to get just commit 1 back into dev to start.
I'm very confused about why Git is reporting one of the files modified in this first commit as being deleted. It would be bold to claim this is a bug, so I'm assuming I don't understand what's happening, and I'm hoping someone can educate me. Thanks!
(In screenshots, irrelevant detail removed for focus, and I'm referring to commits simply by the first two digits of their SHA hash.)
In these images it seems obvious from the first screenshot of merge conflict resolution, that in the dev branch the 8k file RMD.SETUP.ACCOUNT was modified in commit 5e to 10k.
In the second image, it's confirmed that the commit also sees this as a delete. (I didn't actually commit that, I cancelled. This is what would be commited after the merge.)
To verify that nothing happened between the branch of dev to update and the 5e commit, here is a snapshot of the commit message for the current dev branch, commit 30. It shows the last update includes commit 9a and a2. So the progression in dev is a2 > 9a > 30.
This screenshot shows all branches, and 5e is the first after 30.
git tortoise-git
asked Jan 12 at 23:39
TonyGTonyG
1237
I'm trying to do a merge from a development branch 'update' into the 'dev' branch. The 'update' is several commits ahead of dev, and there is potential for conflicts. So I'm merging in 'update' commits one at a time, starting with the first commit after the last dev/update split. So we have dev, branch to update, then N commits, and I'm trying to get just commit 1 back into dev to start.
I'm very confused about why Git is reporting one of the files modified in this first commit as being deleted. It would be bold to claim this is a bug, so I'm assuming I don't understand what's happening, and I'm hoping someone can educate me. Thanks!
(In screenshots, irrelevant detail removed for focus, and I'm referring to commits simply by the first two digits of their SHA hash.)
In these images it seems obvious from the first screenshot of merge conflict resolution, that in the dev branch the 8k file RMD.SETUP.ACCOUNT was modified in commit 5e to 10k.
In the second image, it's confirmed that the commit also sees this as a delete. (I didn't actually commit that, I cancelled. This is what would be commited after the merge.)
To verify that nothing happened between the branch of dev to update and the 5e commit, here is a snapshot of the commit message for the current dev branch, commit 30. It shows the last update includes commit 9a and a2. So the progression in dev is a2 > 9a > 30.
This screenshot shows all branches, and 5e is the first after 30.
git tortoise-git
git tortoise-git
asked Jan 12 at 23:39
TonyGTonyG
1237
asked Jan 12 at 23:39
TonyGTonyG
1237
edited Jan 13 at 0:03
TonyG
asked Jan 12 at 23:39
TonyGTonyG
1237
asked Jan 12 at 23:39
TonyGTonyG
1237
asked Jan 12 at 23:39
TonyGTonyG
1237
1237
add a comment |
add a comment |
0
active
oldest
votes
Your Answer
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "3"
};
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%2fsuperuser.com%2fquestions%2f1393623%2fgit-merge-showing-file-delete-when-it-was-modified%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
0
active
oldest
votes
0
active
oldest
votes
active
oldest
votes
active
oldest
votes
Thanks for contributing an answer to Super User!
- 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%2fsuperuser.com%2fquestions%2f1393623%2fgit-merge-showing-file-delete-when-it-was-modified%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
