git checkout master
git pull origin master
git merge test
git push origin master
If you want to make to be the same as master
git checkout development
git reset --hard master
git push -u origin <local-branch-name>
Force your forked repo to be the same as upstream. Forces master changes into fork and throws away all changes! if no upstream remote created: git remote add upstream https://[upstream guy's repo url]
Based on here
Let's assume that your Python script is example.py:
import os
import time
import sys
import fnmatch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
d = datetime.datetime.now() | |
timezone = pytz.timezone("Asia/Taipei") | |
d_aware = timezone.localize(d) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Compiled source # | |
################### | |
*.com | |
*.class | |
*.dll | |
*.exe | |
*.o | |
*.so | |
# Packages # |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
module.exports = { | |
devServer: { | |
proxy: { | |
'^/api': { | |
target: 'http://localhost:8000', | |
changeOrigin: true, | |
secure: false, | |
pathRewrite: { | |
'^/api': '/api' | |
}, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
async function f() { | |
const fsPromises = require('fs').promises; | |
const data = await fsPromises.readFile('/tmp/data.json') | |
.catch((err) => console.error('Error: ', err)); | |
return JSON.parse(data.toString()); | |
} |
OlderNewer