commit 2bcee280bfb4d0366bb0a5bb1a3e68203b2d9216 from: Stefan Sperling date: Wed Aug 14 10:14:46 2019 UTC explain that out-of-date errors are sent to client commit - cb49e6afccbde6f035f65c453d22b3be99576f82 commit + 2bcee280bfb4d0366bb0a5bb1a3e68203b2d9216 blob - c10d5e6264c75df03c644efb23d168ff94feed11 blob + db8b53a208890cd0530055e93cf46310afc8cbcd --- notes-pull-push +++ notes-pull-push @@ -1,6 +1,7 @@ All this is assuming operation against a custom gotd(8) server which -would queue up incoming commits and run a 'trivial-rebase' operation -for each commit in sequence. +would queue up incoming commits and attempt a 'trivial-rebase' operation +for each commit in sequence. Commits which fail 'trivial-rebase' are +rejected and reported as 'out-of-date' to the client. 'trivial-rebase' merges trees successfully as long as all file content changes apply to the expected 'base blob' content (which implies a