April 9th, 2022 | notes | kipras melnikovas

i saw this tweet from [[(hidden) 4ahyMkecn]] on it being easy to refactor a codebase that's 100% in [[typescript]]
- https://twitter.com/AdamRackis/status/1512628657260482563?t=nGojuMgfrU9LIADtM44A9w&s=19
- and then this got me thinking:
  - https://twitter.com/even_uniquer/status/1512653280505118722?t=6YdqJN-nwnviRXO20x0IqQ&s=19
    - > JavaScript peeps rejoice over the smallest things developers in languages like C#[[(hidden) G97ohL3l8]] take for granted and don&#[[(hidden) G97ohL3l8]]39;t even mention as a thing.
      - {{[[TODO]]}} (hidden) u8YsqDcxs #[[(hidden) 7c2C8PgIV]] #[[(hidden) -VnoIOF8r]]
        
        (hidden) d98yuEzHP [[(hidden) bKgs_zIPQ]]
        
        (hidden) FcmjQ13A8
        
        (hidden) 3GsaDcQxP
        
        (hidden) 2Ibz00bUP
        
        (hidden) WOgdZTOaF
        
        (hidden) QKnFTV5eD [[(hidden) lf_Nd8Mic]]
        
        (hidden) dD-b4VImI [[(hidden) oo0Iuzfm7]] #[[(hidden) S-ygYfi0j]] #react #bs
        
        (hidden) APVEvbhMb
        
        (hidden) tTP6EVJJc
(hidden) 6qHviMVCT
{{[[TODO]]}} (hidden) SPG2vwWS0 #read
- (hidden) 6GKUI7SzH
(hidden) JmXBiNjLD
(hidden) h2i_HkfXd
[[git]] [[git-stacked-rebase]]
- {{[[TODO]]}} thinking about all the cool things we can do. thinking about`--refactor`. need a good blame tool
  - searching for "git advanced blame"
    - https://github.com/tipishev/git_workshop
      - nb, already knew a lot of stuff, but some things new
      - https://twitter.com/wycats/status/153970008983216128
        
        {{[[TODO]]}} #explore `git blame -L`
      - https://jfire.io/blog/2012/03/07/code-archaeology-with-git/
        
        {{[[TODO]]}} #explore `git gui blame`
(hidden) 1TE7_EnCV
(hidden) gD_01RWNy
[[git-stacked-rebase]]
- {{[[TODO]]}} just like regular rebase keeps track of the commits yet to do, we need to do the same for `branchSequencer` (branches). e.g.
  - a) user aborts mid-push, or
  - b) push fails and now user is stuck on a branch
  - c) etc
  - in all cases, we need to be able to `--continue`.
    - {{[[TODO]]}} though, gotta think of how to integrate the `--continue` so that it works for branches when needed, but otherwise would forward to regular rebase's --continue (just like now)
      - probably doable? if we have the list of "branches" yet to be finished, it means we're in progress of a branchSequencer, thus continue it's action onto the next branch; otherwise - regular rebase (operate on commits)
- [[nvim-git-rebase-todo]]
  - {{[[TODO]]}} being able to have a shortcut to toggle the actual patch output would be good
  - {{[[TODO]]}} once hovering the "branch-end", instead of showing the branch's commit's stats, we could instead show the aggregate diff of the whole branch's commits (diff parent)
- {{[[TODO]]}} oooh, `drop` doesn't work, but just removing the commit's line does. #[[(hidden) iZX-mgdkM]]
- {{[[TODO]]}} hmm. double `fixup` one right after another doesn't work, but going 1 by 1 does (2 separate rebases). need to investigate. #[[(hidden) iZX-mgdkM]]
- {{[[TODO]]}} "reword sugar" would be nice
- {{[[TODO]]}} changing places of 2 branches doesn't seem to work - they stay in the same location. need to investigate. #[[(hidden) iZX-mgdkM]]
- {{[[TODO]]}} when moving commits outside of the `branch-end-initial`, we could have 2 separate use cases:
  - 1. if you moved a `branch-end` as well as some commits, then we "unstack" this branch - it becomes an independent one -- still based on `branch-end-initial`, but further branches in the stack are no longer based on it.
    - will prolly be tricky to pull off, since need 2 rebases - 1. to extract the branch itself, 2. to update the partial branches
  - 2. if you moved some commits, but __without__ a `branch-end` (and thus just deleted it, or kept it with fewer commits), then the commits become part of the `branch-end-initial` branch
    - 2 rebases needed again, but at least here it should be easier, because no real extraction happens - we just move the commits earlier, but they're still part of the stack (rather, the stack is based on the same commits as before), so not as many (none?) conflicts to resolve.
  - i think [1] is a pre-requisite, since we need >1 rebase
    - [1] ((cOxwL_xMO))
- {{[[TODO]]}} renaming branches would be nice -- could be another space and the new name of the branch
  - {{[[TODO]]}} tho, PRs would need to be re-created (because you cannot "rename" a branch in [[github]] e.g. -- you need to delete & create a new one)
    - & ofc second-order effect of the next branch pointing to the now-deleted one -- the PR would get closed as well in [[github]]
      - thus, would need to do some magic by 1st changing the base branch to the previous branch, then deleting current branch & creating a new one, and then changing the base branch to the new branch. who said linked lists weren't useful? tho, this is all [[level 2 of gsr]]
- the issues w/ empty commits & wrong applies
  - just noticed the message "Resolved 'package.json' using previous resolution."
    - it was [[git-rerere]]!!!
      - ima disable, dangerous stuff
      - {{[[TODO]]}} document when creating docs (possibly when talking about [[(hidden) zmiEcf1EP]], since this is when i discovered & enabled it)
(hidden) xXATG3GwB
(hidden) EAkO5fr7k
(hidden) Dre8RxQJH
(hidden) Pfhpvv-dG
(hidden) KKYRhYz9j
(hidden) 70srhPl73

words:	985 + 0 = 985
last update: