| // Makefile | |
| // ${workspaceRoot} the path of the folder opened in VS Code | |
| // ${file} the current opened file | |
| // ${fileBasename} the current opened file's basename | |
| // ${fileDirname} the current opened file's dirname | |
| // ${fileExtname} the current opened file's extension | |
| // ${cwd} the task runner's current working directory on startup | |
| { | |
| "version": "0.1.0", | |
| "command": "bash", |
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
As configured in my dotfiles.
start new:
tmux
start new with session name:
| #!/bin/bash | |
| IPT="/sbin/iptables" | |
| # Server IP | |
| SERVER_IP="$(ip addr show eth0 | grep 'inet ' | cut -f2 | awk '{ print $2}')" | |
| # Your DNS servers you use: cat /etc/resolv.conf | |
| DNS_SERVER="8.8.4.4 8.8.8.8" | |
| # Allow connections to this package servers |