Merge master into federation #48
Loading…
Reference in New Issue
No description provided.
Delete Branch "merge-master"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Damn this was beefy. Were there any rough merge conflicts?
The only real problem was with the cargo.lock (well annoyance really). Otherwise it was pretty straightforward.
Actually I was kind of hoping this would let us review where merge conflicts happened. I didn't pay perfect attention to the logic. This would all be much easier if we had federation merged into master, just disabled at build time.