How to manage a fork