...
[15:45:42 CDT(-0500)] <EricDalquist> since the events stuff I just merged into master I know will cause my UP-3231 branch to not compile
[15:45:52 CDT(-0500)] <EricDalquist> not sure what the "best" way to deal with that in git is
...
[15:45:42 CDT(-0500)] <EricDalquist> since the events stuff I just merged into master I know will cause my UP-3231 branch to not compile
[15:45:52 CDT(-0500)] <EricDalquist> not sure what the "best" way to deal with that in git is