HN user

informalo

147 karma
Posts12
Comments32
View on HN

You do need to explicitly specify the other branch when merging or rebasing or making a pull request (like git rebase main), because git doesn’t know what branch you think your offshoot is based on.

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.

My basic understanding

- 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>

You can also easily stitch something like that together yourself.

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.

I think the accuracy doesn't even matter too much. Personally, I believe I base my decision to watch the video after clicking on it on the ballpark the like/dislike ratio is in. "Almost only likes", "2/3 likes", "50/50 likes/dislikes", ... For that purpose, the extension does its job.