Closed NikolasE closed 8 years ago
Was it necessary to make a new pr instead of continuing #11 in order to resolve the merge conflicts?
You should be able to squash these into one commit without making an additional new pr.
If it isn't clear how I can do it later, but googling git squash should get a decent explanation.
Squashed and merged with caa0235
Was it necessary to make a new pr instead of continuing #11 in order to resolve the merge conflicts?
You should be able to squash these into one commit without making an additional new pr.
If it isn't clear how I can do it later, but googling git squash should get a decent explanation.