|
|
|
|
|
by dan-robertson
1420 days ago
|
|
Yeah there’s two solutions: 1. Merge #2 into #1 then merge the result, but this can obscure your history 2. Don’t make the test fail. Eg expect the incorrect behaviour and leave a comment explaining why it is incorrect and what the correct thing should be. |
|