How merge master with newBranch, without loss deleted directory on newBranch
- did
git checkout -b newBranchfrommaster
- on
newBranchdelete some redundant directory but needed onmaster
- pushing some commits on
newBranch
- then have to merge
masterwithnewBranch
problem:
when git merge newBranch from master, in master the necessary directory is deleted, which was deleted on newBranch. (I was counting on a conflict)
on the other side when git merge master from newBranch the deleted directory not adds again.
task:
merge master with newBranch, with saving deleted on newBranch directory.
git git-merge
asked Nov 22 '18 at 19:12
Dmitry G. AndersonDmitry G. Anderson
16
add a comment |
- did
git checkout -b newBranchfrommaster
- on
newBranchdelete some redundant directory but needed onmaster
- pushing some commits on
newBranch
- then have to merge
masterwithnewBranch
problem:
when git merge newBranch from master, in master the necessary directory is deleted, which was deleted on newBranch. (I was counting on a conflict)
on the other side when git merge master from newBranch the deleted directory not adds again.
task:
merge master with newBranch, with saving deleted on newBranch directory.
git git-merge
asked Nov 22 '18 at 19:12
Dmitry G. AndersonDmitry G. Anderson
16
add a comment |
- did
git checkout -b newBranchfrommaster
- on
newBranchdelete some redundant directory but needed onmaster
- pushing some commits on
newBranch
- then have to merge
masterwithnewBranch
problem:
when git merge newBranch from master, in master the necessary directory is deleted, which was deleted on newBranch. (I was counting on a conflict)
on the other side when git merge master from newBranch the deleted directory not adds again.
task:
merge master with newBranch, with saving deleted on newBranch directory.
git git-merge
asked Nov 22 '18 at 19:12
Dmitry G. AndersonDmitry G. Anderson
16
- did
git checkout -b newBranchfrommaster
- on
newBranchdelete some redundant directory but needed onmaster
- pushing some commits on
newBranch
- then have to merge
masterwithnewBranch
problem:
when git merge newBranch from master, in master the necessary directory is deleted, which was deleted on newBranch. (I was counting on a conflict)
on the other side when git merge master from newBranch the deleted directory not adds again.
task:
merge master with newBranch, with saving deleted on newBranch directory.
git git-merge
git git-merge
asked Nov 22 '18 at 19:12
Dmitry G. AndersonDmitry G. Anderson
16
asked Nov 22 '18 at 19:12
Dmitry G. AndersonDmitry G. Anderson
16
edited Nov 22 '18 at 21:01
Dmitry G. Anderson
asked Nov 22 '18 at 19:12
Dmitry G. AndersonDmitry G. Anderson
16
asked Nov 22 '18 at 19:12
Dmitry G. AndersonDmitry G. Anderson
16
asked Nov 22 '18 at 19:12
Dmitry G. AndersonDmitry G. Anderson
16
16
add a comment |
add a comment |
1 Answer
1
active
oldest
votes
I solved this problem with hard copy/past the previously deleted directory from newBranch.
- copy deleted directory on the master
- paste it on the newBranch
- make commit on the newBranch
- checkout to master
- merge master with newBranch
thats all.
answered Nov 30 '18 at 15:02
Dmitry G. AndersonDmitry G. Anderson
16
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%2f53436918%2fhow-merge-master-with-newbranch-without-loss-deleted-directory-on-newbranch%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
I solved this problem with hard copy/past the previously deleted directory from newBranch.
- copy deleted directory on the master
- paste it on the newBranch
- make commit on the newBranch
- checkout to master
- merge master with newBranch
thats all.
answered Nov 30 '18 at 15:02
Dmitry G. AndersonDmitry G. Anderson
16
add a comment |
I solved this problem with hard copy/past the previously deleted directory from newBranch.
- copy deleted directory on the master
- paste it on the newBranch
- make commit on the newBranch
- checkout to master
- merge master with newBranch
thats all.
answered Nov 30 '18 at 15:02
Dmitry G. AndersonDmitry G. Anderson
16
add a comment |
I solved this problem with hard copy/past the previously deleted directory from newBranch.
- copy deleted directory on the master
- paste it on the newBranch
- make commit on the newBranch
- checkout to master
- merge master with newBranch
thats all.
answered Nov 30 '18 at 15:02
Dmitry G. AndersonDmitry G. Anderson
16
I solved this problem with hard copy/past the previously deleted directory from newBranch.
- copy deleted directory on the master
- paste it on the newBranch
- make commit on the newBranch
- checkout to master
- merge master with newBranch
thats all.
answered Nov 30 '18 at 15:02
Dmitry G. AndersonDmitry G. Anderson
16
answered Nov 30 '18 at 15:02
Dmitry G. AndersonDmitry G. Anderson
16
answered Nov 30 '18 at 15:02
Dmitry G. AndersonDmitry G. Anderson
16
answered Nov 30 '18 at 15:02
Dmitry G. AndersonDmitry G. Anderson
16
16
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.
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%2f53436918%2fhow-merge-master-with-newbranch-without-loss-deleted-directory-on-newbranch%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
