How to apply changes from old branch to master, if master now is broken?
I have two branches - broken master and normal_state with an old working code.
Master was broken by merge commit and other severals so, I can't revert those dozens of commits. I need apply my state from normal_state to master. And make it in the way where normal_state will be write above changes of master. How to do that?
git
asked Nov 12 at 11:01
Sergey Shustikov
8,60743887
add a comment |
I have two branches - broken master and normal_state with an old working code.
Master was broken by merge commit and other severals so, I can't revert those dozens of commits. I need apply my state from normal_state to master. And make it in the way where normal_state will be write above changes of master. How to do that?
git
asked Nov 12 at 11:01
Sergey Shustikov
8,60743887
1
This sounds like a series of hacks. Ifmasterbe broken, andnormal_stateis in good condition, then why not just work with the latter branch?
– Tim Biegeleisen
Nov 12 at 11:04
add a comment |
I have two branches - broken master and normal_state with an old working code.
Master was broken by merge commit and other severals so, I can't revert those dozens of commits. I need apply my state from normal_state to master. And make it in the way where normal_state will be write above changes of master. How to do that?
git
asked Nov 12 at 11:01
Sergey Shustikov
8,60743887
I have two branches - broken master and normal_state with an old working code.
Master was broken by merge commit and other severals so, I can't revert those dozens of commits. I need apply my state from normal_state to master. And make it in the way where normal_state will be write above changes of master. How to do that?
git
git
asked Nov 12 at 11:01
Sergey Shustikov
8,60743887
asked Nov 12 at 11:01
Sergey Shustikov
8,60743887
asked Nov 12 at 11:01
Sergey Shustikov
8,60743887
asked Nov 12 at 11:01
Sergey Shustikov
8,60743887
asked Nov 12 at 11:01
Sergey Shustikov
8,60743887
8,60743887
1
This sounds like a series of hacks. Ifmasterbe broken, andnormal_stateis in good condition, then why not just work with the latter branch?
– Tim Biegeleisen
Nov 12 at 11:04
add a comment |
1
This sounds like a series of hacks. Ifmasterbe broken, andnormal_stateis in good condition, then why not just work with the latter branch?
– Tim Biegeleisen
Nov 12 at 11:04
1
1
This sounds like a series of hacks. If
master be broken, and normal_state is in good condition, then why not just work with the latter branch?– Tim Biegeleisen
Nov 12 at 11:04
This sounds like a series of hacks. If
master be broken, and normal_state is in good condition, then why not just work with the latter branch?– Tim Biegeleisen
Nov 12 at 11:04
add a comment |
2 Answers
2
active
oldest
votes
If you have control over the remote version of master branch (I mean if you either are alone on the repo, or have explicitly agreed with the other users), make a backup of the current state of master for further debugging, and reset it where normal_state is :
git checkout master
git checkout -b backup_master
git branch -f master normal_state
git push -f origin master
You'll then be able to work on backup_master to clean up the mess if needed.
answered Nov 12 at 11:33
RomainValeri
1,51811224
add a comment |
Use rebase to apply the commits in your normal_state on top of master. You will probably get to solve some merge-conflicts.
git rebase master normal_state
answered Nov 12 at 15:06
Ygg
1,8531021
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%2f53260764%2fhow-to-apply-changes-from-old-branch-to-master-if-master-now-is-broken%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
2 Answers
2
active
oldest
votes
2 Answers
2
active
oldest
votes
active
oldest
votes
active
oldest
votes
If you have control over the remote version of master branch (I mean if you either are alone on the repo, or have explicitly agreed with the other users), make a backup of the current state of master for further debugging, and reset it where normal_state is :
git checkout master
git checkout -b backup_master
git branch -f master normal_state
git push -f origin master
You'll then be able to work on backup_master to clean up the mess if needed.
answered Nov 12 at 11:33
RomainValeri
1,51811224
add a comment |
If you have control over the remote version of master branch (I mean if you either are alone on the repo, or have explicitly agreed with the other users), make a backup of the current state of master for further debugging, and reset it where normal_state is :
git checkout master
git checkout -b backup_master
git branch -f master normal_state
git push -f origin master
You'll then be able to work on backup_master to clean up the mess if needed.
answered Nov 12 at 11:33
RomainValeri
1,51811224
add a comment |
If you have control over the remote version of master branch (I mean if you either are alone on the repo, or have explicitly agreed with the other users), make a backup of the current state of master for further debugging, and reset it where normal_state is :
git checkout master
git checkout -b backup_master
git branch -f master normal_state
git push -f origin master
You'll then be able to work on backup_master to clean up the mess if needed.
answered Nov 12 at 11:33
RomainValeri
1,51811224
If you have control over the remote version of master branch (I mean if you either are alone on the repo, or have explicitly agreed with the other users), make a backup of the current state of master for further debugging, and reset it where normal_state is :
git checkout master
git checkout -b backup_master
git branch -f master normal_state
git push -f origin master
You'll then be able to work on backup_master to clean up the mess if needed.
answered Nov 12 at 11:33
RomainValeri
1,51811224
answered Nov 12 at 11:33
RomainValeri
1,51811224
answered Nov 12 at 11:33
RomainValeri
1,51811224
answered Nov 12 at 11:33
RomainValeri
1,51811224
1,51811224
add a comment |
add a comment |
Use rebase to apply the commits in your normal_state on top of master. You will probably get to solve some merge-conflicts.
git rebase master normal_state
answered Nov 12 at 15:06
Ygg
1,8531021
add a comment |
Use rebase to apply the commits in your normal_state on top of master. You will probably get to solve some merge-conflicts.
git rebase master normal_state
answered Nov 12 at 15:06
Ygg
1,8531021
add a comment |
Use rebase to apply the commits in your normal_state on top of master. You will probably get to solve some merge-conflicts.
git rebase master normal_state
answered Nov 12 at 15:06
Ygg
1,8531021
Use rebase to apply the commits in your normal_state on top of master. You will probably get to solve some merge-conflicts.
git rebase master normal_state
answered Nov 12 at 15:06
Ygg
1,8531021
answered Nov 12 at 15:06
Ygg
1,8531021
answered Nov 12 at 15:06
Ygg
1,8531021
answered Nov 12 at 15:06
Ygg
1,8531021
1,8531021
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%2f53260764%2fhow-to-apply-changes-from-old-branch-to-master-if-master-now-is-broken%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
1
This sounds like a series of hacks. If
masterbe broken, andnormal_stateis in good condition, then why not just work with the latter branch?– Tim Biegeleisen
Nov 12 at 11:04