Difference between revisions of "Supermemo backup using Git"
Jump to navigation
Jump to search
(Created page with "I storngly discourage naming the files "pull.bat" and "push.bat" as both will be next to each other, increasing the chances to missclick leading to potential local deletions....") |
m |
||
Line 1: | Line 1: | ||
I storngly discourage naming the files "pull.bat" and "push.bat" as both will be next to each other, increasing the chances to missclick leading to potential local deletions. | I storngly discourage naming the files "pull.bat" and "push.bat" as both will be next to each other, increasing the chances to missclick leading to potential local deletions. | ||
'''sm-push.bat''' | |||
<pre> | <pre> | ||
git add -A && git commit -m "Update" | git add -A && git commit -m "Update" | ||
Line 7: | Line 7: | ||
</pre> | </pre> | ||
'''pull-sm.bat''' | |||
<pre> | <pre> | ||
git pull | git pull | ||
</pre> | </pre> | ||
'''resolve-conflicts''' | |||
<pre> | <pre> | ||
git reset --hard | git reset --hard |
Revision as of 16:51, 26 August 2021
I storngly discourage naming the files "pull.bat" and "push.bat" as both will be next to each other, increasing the chances to missclick leading to potential local deletions.
sm-push.bat
git add -A && git commit -m "Update" git push
pull-sm.bat
git pull
resolve-conflicts
git reset --hard git checkout -b temp git branch -D main git fetch git checkout main