Hi, I don't know how to make such a scenario work: - two repositories: pub, priv - priv is clone/branch of pub - there is some constant developement both in pub and priv - there are regular syncs with pub in priv Problem: Occasionally I want to push some changes from priv to pub. Then after syncing with pub I want to get as few conflicts as possible. Is it possible to do with git? Thanks Lukasz -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html