147 karma · joined March 7, 2022
I think a big issue with the presented intuition is that it's limited to wanting to merge the base/trunk/main branch into your feature branch. However, sometimes you want to merge a feature branch into another feature branch. With this in mind, you can form a better intuition, imo, where it's absolutely clear that you have to specify what branch you want to merge into another one.
Watching this about a year ago was eye opening to me and I wished I'd found this video when I started studying in college!
[1] https://thevaluable.dev/zsh-line-editor-configuration-mousel...
Don't know how reliable this is though or whether a web developer could work around this.
*SmoothScroll*$script- Untracked: Files that Git doesn't know about.
- Tracked: Files that Git knows about. Further divided into unstaged files (will not be part of the next commit) and staged files (will be part of the next commit).
What helped me here was to know that it's possible to track a (yet untracked) file without staging it:
git add --intent-to-add <path> news.ycombinator.com##a:has-text(Hacker News):style(color: green !important)
[1]: https://github.com/gorhill/uBlock/wiki/Procedural-cosmetic-f...
[2]: https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#...After `brew install pngpaste tesseract` (the latter is a dependency of the great OCRmyPDF tool btw), you can set `alias ocr="pngpaste - | tesseract -c debug_file=/dev/null stdin stdout | pbcopy; pbpaste"`.
I like having this alias better than macOCR because the workflow feels more ergonomic: You first cmd + shift + 4 to select text and then type `ocr` with the result being printed to stdout and being saved in your clipboard. With macOCR I have to go to the terminal first to initiate the process, then go back to what I want to screenshot etc.
Funny enough it's not documented, so let's see how long it will stick around for: https://support.spotify.com/kr-en/article/keyboard-shortcuts...
https://chrome.google.com/webstore/detail/return-youtube-dis... (also available for Firefox, Edge, ..)
Of course, it doesn't solve the recommendation issue the thread creator mentioned.