Skip to content

Instantly share code, notes, and snippets.

View mirhamasala's full-sized avatar
🎯
Focusing

Mirha Masala mirhamasala

🎯
Focusing
38 followers · 1 following
View GitHub Profile
@szemate
szemate / package-lock-conflicts.md
Last active June 13, 2024 15:11
How to resolve package-lock.json conflicts

How to resolve package-lock.json conflicts

It is not possible to resolve conflicts of package-lock.json in GitHub's merge tool and you need to do a manual merge.

  1. Update the master branch with the latest changes: 
    git checkout master
git pull
  2. Merge your feature branch into master:
@theodorosploumis
theodorosploumis / Nework_throttling_profiles.md
Last active June 21, 2024 11:28
Web development - Custom network throttling profiles
Profile download (kb/s) upload (kb/s) latency (ms)
Native 0 0 0
GPRS 50 20 500
56K Dial-up 50 30 120
Mobile EDGE 240 200 840
2G Regular 250 50 300
2G Good 450 150 150
3G Slow 780 330 200
@gagarine
gagarine / fish_install.md
Last active June 5, 2024 20:25
Install fish shell on macOS Mojave with brew

Installing Fish shell on MacOS (Intel and M1) using brew

Fish is a smart and user-friendly command line (like bash or zsh). This is how you can instal Fish on MacOS and make your default shell.

Note that you need the https://brew.sh/ package manager installed on your machine.

Install Fish

brew install fish