search

colin-broderick / emu

0 stars 1 forks source link

Implemented JMP indirect and test #5

Closed Mark-Platts closed 3 years ago

Mark-Platts commented 3 years ago

Added the JMP (indirect) instruction and then created a small test for it.

Not sure why this has conflicted. I might have accidently forgot to pull before starting the next bit of work.

This could be a good chance to resolve a merge conflict with an easy example.

colin-broderick commented 3 years ago

Indeed. Would you like me to wait until we're in a call again so you can see how it goes?

Mark-Platts commented 3 years ago

I just had a quick look and it's the same as what I've seen before. I'll leave it for you to have a look.

You get both versions side by side. Then you just delete the one you don't want, as well as the markings that git uses to cordon off the offending parts. Then just mark as resolved!

Mark-Platts commented 3 years ago

It looks like we were both trying to test something at the same time and changes which example was running.