Skip to content

Instantly share code, notes, and snippets.

View touero's full-sized avatar
😅
I may be slow to respond.

Ensong Wei touero

😅
I may be slow to respond.
  • Bingzgoj Si
View GitHub Profile
@touero
touero / github_pr_resolve_conflicts.md
Last active November 19, 2023 14:32
How to resolve code conflicts caused by submitting PR on github?

After fork and git clone

fork_url: your forking repo
origin_url: repo forked by you
step.1: Check current origin, it should be fork_url.

git remote -v

step.2: Remove current origin.

git remote remove origin
@touero
touero / setup_zsh.sh
Last active November 19, 2023 14:34
The very first settings of zsh.
#!/bin/bash
#!chmod +x setup.sh
proxy_address="your_proxy_address"
proxy_port="your_proxy_port"
export http_proxy="http://${proxy_address}:${proxy_port}"
export https_proxy="http://${proxy_address}:${proxy_port}"
sudo apt update && sudo apt upgrade