manipuler git divergé

# depends why upstream state changed. 
# If someone else is working on the same branch,
# the good way to solve it is to rebase your commits on top of the remote state:
$ git rebase origin # +/branch_name if want to specify 

# Another way to fix the issue is to merge the upstream branch state to local:
$ git merge origin #  +/branch_name
Literate Lentil