Dealing with simultaneous offline and online updates
Once the [offline] changes are merged, an automated task will pull them to the online shared filesystem, so that they are accessible to the Hlt farm (if applicable).
What if that fails? Perhaps we should consider the expanded timeline:
- new online conditions are about to be committed
- someone merges an offline change at about the same time
-
git pull
in the online clone <- should this be mandatory? - how to proceed?
- commit online conditions for the run and use them, potentially missing offline changes
- commit won't be on the mainline, is this a problem?
- what if there's a conflict?
-
git push
and only use conditions if that succeeds (keep linear history)- if it fails,
git pull --merge
<- what if there's a conflict? -
git push
again
- if it fails,
- commit online conditions for the run and use them, potentially missing offline changes