this should allow pulling from upstream without config_source_reset=yes
local changes are stored into commit of tmp branch, upstream branch
is reset, pulled and the local commit merged to it