The Update Cycle#
does not automatically synchronize between devices, it is up to the developer to trigger a synchronization.
Developer 1
checks out the repository
π΄ Developer 2 π΄
Developer 1
several changes added
created a commit
π΄ Developer 2 π΄
Developer 1
fetches changes from
origin
π΄ Developer 2 π΄
Developer 1
pushes local changes to
origin
π΄ Developer 2 π΄
Developer 1
performs the 2nd update cycle
π΄ Developer 2 π΄
Developer 1
several changes added
created a commit
Developer 2
checks out the repository
Developer 1
performed the 3rd update cycle
Developer 2
tries to push local changes to
origin
push rejected
Changes from origin
were not included
π΄ Developer 1 π΄
Developer 2
merges the state from
origin
into the local branch
π΄ Developer 1 π΄
Developer 2
rebases the local branch onto the state of
origin
π΄ Developer 1 π΄
Developer 2
pushes local merge commit to
origin
, completing the 1st update cycle
π΄ Developer 1 π΄
Developer 2
pushes local merge commit to
origin
, completing the 1st update cycle