Closed bcipolli closed 8 years ago
@atsuch I pulled (and augmented) this commit from your code. This will likely conflict (sorry!).
Can you rebase your current code on top of master after I merge this? git rebase upstream/master
git rebase upstream/master
Seems to be working for me. Merging!
@atsuch I pulled (and augmented) this commit from your code. This will likely conflict (sorry!).
Can you rebase your current code on top of master after I merge this?
git rebase upstream/master