The state of Meld on Macs is currently in flux. TLDR: currently, the best
way to run Meld is to install Homebrew and then run
brew install dehesselle-meld.
The
dehesselle-meld cask will
Ilya Grigoriev ilyagr
ilyagr
/ command_line_output.txt
Last active
November 5, 2023 02:42
Poetry bug https://github.com/python-poetry/poetry/issues/8623
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| $ poetry install --no-root -vvv | |
| Using virtualenv: /home/ilyagr/.cache/pypoetry/virtualenvs/jj-docs-ZVbGoaMc-py3.11 | |
| Installing dependencies from lock file | |
| Warning: poetry.lock is not consistent with pyproject.toml. You may be getting improper dependencies. Run `poetry lock [--no-update]` to fix it. | |
| Finding the necessary packages for the current system | |
| Package operations: 0 installs, 1 update, 0 removals, 36 skipped | |
| • Installing babel (2.13.1): Pending... |
ilyagr
/ .gitconfig
Created
February 10, 2023 05:25
— forked from amiryal/git config
Easily visualise Git merge.conflictstyle diff3 with meld, while preserving all information
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [merge] | |
| conflictstyle = diff3 | |
| tool = three_meld | |
| [mergetool "three_meld"] | |
| # Opens up four diff windows: | |
| # LOCAL:MERGED, BASE:LOCAL, BASE:REMOTE, LOCAL:REMOTE | |
| # | |
| # Lets you edit the MERGED file (including original diff3 markers), showing | |
| # you the final diff from LOCAL. For reference, you can look in the other | |
| # windows to see how LOCAL and REMOTE are each different from BASE, as well |
vimdiff comes as a pre-configured merge tool for jj
and can be used with jj resolve out of the box. However, the default configuration for
vimdiff as a diff editor (for jj split, etc.) is barely useable.
To more conveniently use Vim as a difftool for jj, try one of the following setups:
- Install the
DirDiffVim plugin.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # This file is machine-generated - editing it directly is not advised | |
| [[AbstractFFTs]] | |
| deps = ["LinearAlgebra"] | |
| git-tree-sha1 = "051c95d6836228d120f5f4b984dd5aba1624f716" | |
| uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" | |
| version = "0.5.0" | |
| [[Adapt]] | |
| deps = ["LinearAlgebra"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <html><body><script type="module"> | |
| import { html, render } from "https://unpkg.com/[email protected]?module"; | |
| function _selector(values) { | |
| return html` | |
| <select> | |
| <option value="">Choose one:</option> | |
| ${values.map( | |
| k => |