+−⟲ master master master master client-1 client-1 client-1 client-1 merge upstreamchanges merge upstreamchanges client-1 merge upstreamchanges merge upstreamchanges branch-off clientcode is updated clientcode is updated clientcode is updated branch-off