There are two types of conflicts. Or as I’ve started referring to it, there is conflict resolution and conflict prevention.
CBL 1 already does conflict prevention (your option 2.) If you try to save a doc and your base revision isn’t current anymore, the save fails with an error. It’s possible to bypass that and deliberately create a conflict, but I don’t recommend it.
CBL 2 will automatically do option 1 for you. Using CBL 1 you can do that yourself by running a query after replication. Or you can do option 3 if you want. It depends on how urgent you feel conflict resolution is.