Closed atteggiani closed 6 months ago
I suggest deferring this PR until #20 is merged.
Yeah I thought about what would happen since there are modifications in those files. But if we merge this PR first, then won't git handle it for the other one? We might get asked to solve solve some conflicts but wouldn't that be ok?
Anyway it can be merged afterwards, it's just a curiosity I have.
I suggest deferring this PR until #20 is merged.
Yeah I thought about what would happen since there are modifications in those files. But if we merge this PR first, then won't git handle it for the other one? We might get asked to solve solve some conflicts but wouldn't that be ok?
I haven't come across this condition before. There might be a conflict with #33, even if this is merged 1st. It depends if git detects there's whitespace differences between the #34 version & the file deleted in PR #33 & flags a diff.
Fixes #24