0

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?

CodeWizard
  • 128,036
  • 21
  • 144
  • 167
Fifth Dimension Dragon
  • 187
  • 10

1 Answers1

0

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.

Fifth Dimension Dragon
  • 187
  • 10
  • 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. – Fifth Dimension Dragon Nov 17 '18 at 14:50