Have previous git commit overwrite all similar files of future commit [duplicate]
This question already has an answer here:
How to revert a Git repository to a previous commit
40 answers
git log -- onefile reveals this...
d2c2408 - (HEAD, master) yet another fix
5cfc62f - updated web socket for shared blockchain
78bc7b8 - transactions, transaction pool update
b47bf1d - transaction added
d831d08 - added wallet
I need for d831d08 commit to merge into d2c2408.
But in the process, I need for the previous commit d831d08 to overwrite any and all files that future commit has d2c2408. Meaning, I want to keep all the future progress that the future commit has but I need to overwrite everything the previous commit has.
What git command do I do this with?
git overwrite
edited Nov 17 '18 at 13:41
CodeWizard
51.9k126995
asked Nov 17 '18 at 13:39
Nik LoladzeNik Loladze
1
marked as duplicate by Suma, Matthieu Brucher, torek git
Users with the git badge can single-handedly close git questions as duplicates and reopen them as needed.
StackExchange.ready(function() {
if (StackExchange.options.isMobile) return;
$('.dupe-hammer-message-hover:not(.hover-bound)').each(function() {
var $hover = $(this).addClass('hover-bound'),
$msg = $hover.siblings('.dupe-hammer-message');
$hover.hover(
function() {
$hover.showInfoMessage('', {
messageElement: $msg.clone().show(),
transient: false,
position: { my: 'bottom left', at: 'top center', offsetTop: -7 },
dismissable: false,
relativeToBody: true
});
},
function() {
StackExchange.helpers.removeMessages();
}
);
});
});
Nov 17 '18 at 19:10
This question has been asked before and already has an answer. If those answers do not fully address your question, please ask a new question.
add a comment |
This question already has an answer here:
How to revert a Git repository to a previous commit
40 answers
git log -- onefile reveals this...
d2c2408 - (HEAD, master) yet another fix
5cfc62f - updated web socket for shared blockchain
78bc7b8 - transactions, transaction pool update
b47bf1d - transaction added
d831d08 - added wallet
I need for d831d08 commit to merge into d2c2408.
But in the process, I need for the previous commit d831d08 to overwrite any and all files that future commit has d2c2408. Meaning, I want to keep all the future progress that the future commit has but I need to overwrite everything the previous commit has.
What git command do I do this with?
git overwrite
edited Nov 17 '18 at 13:41
CodeWizard
51.9k126995
asked Nov 17 '18 at 13:39
Nik LoladzeNik Loladze
1
marked as duplicate by Suma, Matthieu Brucher, torek git
Users with the git badge can single-handedly close git questions as duplicates and reopen them as needed.
StackExchange.ready(function() {
if (StackExchange.options.isMobile) return;
$('.dupe-hammer-message-hover:not(.hover-bound)').each(function() {
var $hover = $(this).addClass('hover-bound'),
$msg = $hover.siblings('.dupe-hammer-message');
$hover.hover(
function() {
$hover.showInfoMessage('', {
messageElement: $msg.clone().show(),
transient: false,
position: { my: 'bottom left', at: 'top center', offsetTop: -7 },
dismissable: false,
relativeToBody: true
});
},
function() {
StackExchange.helpers.removeMessages();
}
);
});
});
Nov 17 '18 at 19:10
This question has been asked before and already has an answer. If those answers do not fully address your question, please ask a new question.
1
Not clear to me what you need.
– CodeWizard
Nov 17 '18 at 13:42
I would like whatever files previous commit "d831d08 - added wallet" has to overwrite the current commit. How do I go about doing that?
– Nik Loladze
Nov 17 '18 at 13:53
add a comment |
This question already has an answer here:
How to revert a Git repository to a previous commit
40 answers
git log -- onefile reveals this...
d2c2408 - (HEAD, master) yet another fix
5cfc62f - updated web socket for shared blockchain
78bc7b8 - transactions, transaction pool update
b47bf1d - transaction added
d831d08 - added wallet
I need for d831d08 commit to merge into d2c2408.
But in the process, I need for the previous commit d831d08 to overwrite any and all files that future commit has d2c2408. Meaning, I want to keep all the future progress that the future commit has but I need to overwrite everything the previous commit has.
What git command do I do this with?
git overwrite
edited Nov 17 '18 at 13:41
CodeWizard
51.9k126995
asked Nov 17 '18 at 13:39
Nik LoladzeNik Loladze
1
This question already has an answer here:
How to revert a Git repository to a previous commit
40 answers
git log -- onefile reveals this...
d2c2408 - (HEAD, master) yet another fix
5cfc62f - updated web socket for shared blockchain
78bc7b8 - transactions, transaction pool update
b47bf1d - transaction added
d831d08 - added wallet
I need for d831d08 commit to merge into d2c2408.
But in the process, I need for the previous commit d831d08 to overwrite any and all files that future commit has d2c2408. Meaning, I want to keep all the future progress that the future commit has but I need to overwrite everything the previous commit has.
What git command do I do this with?
This question already has an answer here:
How to revert a Git repository to a previous commit
40 answers
git overwrite
git overwrite
edited Nov 17 '18 at 13:41
CodeWizard
51.9k126995
asked Nov 17 '18 at 13:39
Nik LoladzeNik Loladze
1
edited Nov 17 '18 at 13:41
CodeWizard
51.9k126995
asked Nov 17 '18 at 13:39
Nik LoladzeNik Loladze
1
edited Nov 17 '18 at 13:41
CodeWizard
51.9k126995
edited Nov 17 '18 at 13:41
CodeWizard
51.9k126995
edited Nov 17 '18 at 13:41
CodeWizard
51.9k126995
51.9k126995
asked Nov 17 '18 at 13:39
Nik LoladzeNik Loladze
1
asked Nov 17 '18 at 13:39
Nik LoladzeNik Loladze
1
asked Nov 17 '18 at 13:39
Nik LoladzeNik Loladze
1
1
marked as duplicate by Suma, Matthieu Brucher, torek git
Users with the git badge can single-handedly close git questions as duplicates and reopen them as needed.
StackExchange.ready(function() {
if (StackExchange.options.isMobile) return;
$('.dupe-hammer-message-hover:not(.hover-bound)').each(function() {
var $hover = $(this).addClass('hover-bound'),
$msg = $hover.siblings('.dupe-hammer-message');
$hover.hover(
function() {
$hover.showInfoMessage('', {
messageElement: $msg.clone().show(),
transient: false,
position: { my: 'bottom left', at: 'top center', offsetTop: -7 },
dismissable: false,
relativeToBody: true
});
},
function() {
StackExchange.helpers.removeMessages();
}
);
});
});
Nov 17 '18 at 19:10
This question has been asked before and already has an answer. If those answers do not fully address your question, please ask a new question.
marked as duplicate by Suma, Matthieu Brucher, torek git
Users with the git badge can single-handedly close git questions as duplicates and reopen them as needed.
StackExchange.ready(function() {
if (StackExchange.options.isMobile) return;
$('.dupe-hammer-message-hover:not(.hover-bound)').each(function() {
var $hover = $(this).addClass('hover-bound'),
$msg = $hover.siblings('.dupe-hammer-message');
$hover.hover(
function() {
$hover.showInfoMessage('', {
messageElement: $msg.clone().show(),
transient: false,
position: { my: 'bottom left', at: 'top center', offsetTop: -7 },
dismissable: false,
relativeToBody: true
});
},
function() {
StackExchange.helpers.removeMessages();
}
);
});
});
Nov 17 '18 at 19:10
This question has been asked before and already has an answer. If those answers do not fully address your question, please ask a new question.
1
Not clear to me what you need.
– CodeWizard
Nov 17 '18 at 13:42
I would like whatever files previous commit "d831d08 - added wallet" has to overwrite the current commit. How do I go about doing that?
– Nik Loladze
Nov 17 '18 at 13:53
add a comment |
1
Not clear to me what you need.
– CodeWizard
Nov 17 '18 at 13:42
I would like whatever files previous commit "d831d08 - added wallet" has to overwrite the current commit. How do I go about doing that?
– Nik Loladze
Nov 17 '18 at 13:53
1
1
Not clear to me what you need.
– CodeWizard
Nov 17 '18 at 13:42
Not clear to me what you need.
– CodeWizard
Nov 17 '18 at 13:42
I would like whatever files previous commit "d831d08 - added wallet" has to overwrite the current commit. How do I go about doing that?
– Nik Loladze
Nov 17 '18 at 13:53
I would like whatever files previous commit "d831d08 - added wallet" has to overwrite the current commit. How do I go about doing that?
– Nik Loladze
Nov 17 '18 at 13:53
add a comment |
1 Answer
1
active
oldest
votes
There was an error in my node_modules caused by installing dependencies between two different environments and pulling these repos instead of installing the dependencies natively for each work environment. Frankly, I'm not skilled enough yet to delve into it. So what I did was simply copy and overwrite the node_modules from the previous commit into the most recent commit. This fixed the nodemon issue of not being able to run my script.
answered Nov 17 '18 at 14:36
Nik LoladzeNik Loladze
1
What it probably was, was that I downloaded a dependency on the other work environment, pulled it into the other and for whatever reason that dependency didn't exist on the new work environment. But NPM believed it did, thus nodemon wouldn't start.
– Nik Loladze
Nov 17 '18 at 14:50
add a comment |
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
There was an error in my node_modules caused by installing dependencies between two different environments and pulling these repos instead of installing the dependencies natively for each work environment. Frankly, I'm not skilled enough yet to delve into it. So what I did was simply copy and overwrite the node_modules from the previous commit into the most recent commit. This fixed the nodemon issue of not being able to run my script.
answered Nov 17 '18 at 14:36
Nik LoladzeNik Loladze
1
What it probably was, was that I downloaded a dependency on the other work environment, pulled it into the other and for whatever reason that dependency didn't exist on the new work environment. But NPM believed it did, thus nodemon wouldn't start.
– Nik Loladze
Nov 17 '18 at 14:50
add a comment |
There was an error in my node_modules caused by installing dependencies between two different environments and pulling these repos instead of installing the dependencies natively for each work environment. Frankly, I'm not skilled enough yet to delve into it. So what I did was simply copy and overwrite the node_modules from the previous commit into the most recent commit. This fixed the nodemon issue of not being able to run my script.
answered Nov 17 '18 at 14:36
Nik LoladzeNik Loladze
1
What it probably was, was that I downloaded a dependency on the other work environment, pulled it into the other and for whatever reason that dependency didn't exist on the new work environment. But NPM believed it did, thus nodemon wouldn't start.
– Nik Loladze
Nov 17 '18 at 14:50
add a comment |
There was an error in my node_modules caused by installing dependencies between two different environments and pulling these repos instead of installing the dependencies natively for each work environment. Frankly, I'm not skilled enough yet to delve into it. So what I did was simply copy and overwrite the node_modules from the previous commit into the most recent commit. This fixed the nodemon issue of not being able to run my script.
answered Nov 17 '18 at 14:36
Nik LoladzeNik Loladze
1
There was an error in my node_modules caused by installing dependencies between two different environments and pulling these repos instead of installing the dependencies natively for each work environment. Frankly, I'm not skilled enough yet to delve into it. So what I did was simply copy and overwrite the node_modules from the previous commit into the most recent commit. This fixed the nodemon issue of not being able to run my script.
answered Nov 17 '18 at 14:36
Nik LoladzeNik Loladze
1
answered Nov 17 '18 at 14:36
Nik LoladzeNik Loladze
1
answered Nov 17 '18 at 14:36
Nik LoladzeNik Loladze
1
answered Nov 17 '18 at 14:36
Nik LoladzeNik Loladze
1
1
What it probably was, was that I downloaded a dependency on the other work environment, pulled it into the other and for whatever reason that dependency didn't exist on the new work environment. But NPM believed it did, thus nodemon wouldn't start.
– Nik Loladze
Nov 17 '18 at 14:50
add a comment |
What it probably was, was that I downloaded a dependency on the other work environment, pulled it into the other and for whatever reason that dependency didn't exist on the new work environment. But NPM believed it did, thus nodemon wouldn't start.
– Nik Loladze
Nov 17 '18 at 14:50
What it probably was, was that I downloaded a dependency on the other work environment, pulled it into the other and for whatever reason that dependency didn't exist on the new work environment. But NPM believed it did, thus nodemon wouldn't start.
– Nik Loladze
Nov 17 '18 at 14:50
What it probably was, was that I downloaded a dependency on the other work environment, pulled it into the other and for whatever reason that dependency didn't exist on the new work environment. But NPM believed it did, thus nodemon wouldn't start.
– Nik Loladze
Nov 17 '18 at 14:50
add a comment |
1
Not clear to me what you need.
– CodeWizard
Nov 17 '18 at 13:42
I would like whatever files previous commit "d831d08 - added wallet" has to overwrite the current commit. How do I go about doing that?
– Nik Loladze
Nov 17 '18 at 13:53