updating the clone --bare to make sure it's a shared repo
Adding merge steps, including fixing R4_HEAD then merging into 4.2
master