pull rule that says when you pull don't consider these 2 files and don't kill them?
I'm not sure
This is the way you should be thinking. Make one central repo and one of you simply fork the branch. If it's forked you can exchange changes between code quite easily by just pull requesting to each other.
Обсуждают сегодня