1.[Git] You have divergent branches and need to specify how to reconcile them.

post-thumbnail