mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-19 02:17:09 +00:00
The pages still told users to inspect conflicts with git status and to fix diverged tracked repos with git pull --rebase, but pull now merges diverged history, resolves .metadata.json conflicts on its own, and undoes the merge on any other conflict, so those steps no longer match what happens. Also documents the Git Sync page fetch, the Pull count, and the push_rejected API error in every translated locale.