r=self updated function to get git commits
r=self Merging the conflicts