Craftmanship Ok merge from remote is just one of the sections. Many branches will add their stuff in this file. Here are some lines that Guillaume cannot see yet. mergeFromRemote