I got a notification to the effect of
Your teacher edited a file, click here
And was presented the conflicts screen with several dozen file conflicts.
In my case, I would rather just take all of their changes (I don't remember making any of these "changes") and would much rather only have to click a button to have their changes overwrite all local changes with their.
Basically It would save me a lot of time to be able to effectively git pull --strategy theirs --force in one operation.
I got a notification to the effect of
And was presented the conflicts screen with several dozen file conflicts.
In my case, I would rather just take all of their changes (I don't remember making any of these "changes") and would much rather only have to click a button to have their changes overwrite all local changes with their.
Basically It would save me a lot of time to be able to effectively
git pull --strategy theirs --forcein one operation.