#merging in steps

1 messages · Page 1 of 1 (latest)

heady sluice
#

@plucky raven The last time you did a MicroPython merge, were you able to break it into multiple partial merges? I would kind of like to do this, so I have intermediate commits I can test. E.g., first one - get rid of all the unnecessary files, etc. I started to do the merge, but it's getting out of hand rather quickly.

Maybe I can't do that, so I just have to test along the way, after each bunch of related changes.

plucky raven
#

I don't really remember how I did it last time, except that I failed to use a script Scott wrote to not merge some directories & files

#

"obviously" you can git merge any intermediate commit you like so say that ref aabbccdd introduced some really gnarly stuff you could merge aabbccdd^ (the parent commit) and commit it, then merge aabbccdd, then test. so you're just dealing with one aspect of the changes in 1.19..