March 27th, 2022 | notes | kipras melnikovas

(hidden) EGXciMxb0 [[(hidden) H8VAVbNIn]]
- {{[[TODO]]}} (hidden) ycDT0xV_o #read
  - {{[[TODO]]}} (hidden) QgPguak_F [[high signal]] [[(hidden) bXOgJaxzT]] #[[(hidden) BihBadAIv]]
    - (hidden) e1qnOzAWa
    - (hidden) 2JK4gXrtH
  - {{[[TODO]]}} (hidden) eW6DuJcUI #read
    - {{[[TODO]]}} (hidden) qkJwp41T_ #read
      - (hidden) ATWYw4AXb
      - (hidden) EfI-w6Y18 [[(hidden) mtMPoV2M4]] [[(hidden) 54s8iu4mg]]
        
        (hidden) sI-hjp9ta
      - {{[[TODO]]}} (hidden) 9vp9f4yK- #read
        
        (hidden) zXsO8p_mY
- (hidden) M1_HX59dh
- (hidden) t2QtXOGGb [[(hidden) 5fvon3fhs]]
(hidden) vUNm7tXEf
(hidden) Dh3xFJ12_
(hidden) 2hmPCbeVS
(hidden) c7geYh48J [[(hidden) 7CRWJsCnJ]]
- (hidden) u8mWNjwa0
(hidden) gFv64PtZG
(hidden) UjMJMBRRs
[[git-stacked-rebase]]
- found out there's ofc more people doing stuff like this!
  - from [[(hidden) tv1zOVzED]]
    - {{[[TODO]]}} #read https://news.ycombinator.com/item?id=29255195
      - {{[[TODO]]}} #read https://gerrit.googlesource.com/gerrit/+/refs/heads/master/lib/
        
        https://gerrit-review.googlesource.com/Documentation/intro-gerrit-walkthrough.html
      - {{[[DONE]]}} #read https://graphite.dev/blog/post/DThX8ffP1gmxWJChEv0y
        
        https://jg.gg/2018/09/29/stacked-diffs-versus-pull-requests/
        
        (hidden) tmDDEqjaw #[[(hidden) 7c2C8PgIV]]
        
        (hidden) hNj6arDcd [[(hidden) 37rJr30_V]] [[high signal]]
        
        (hidden) 0DLpAOh8w
        
        (hidden) 3WXjpPBsx [[(hidden) BnNcnokoC]] #[[(hidden) lh-ZUdNjE]]
        
        (hidden) YCU0xlqxY
        
        (hidden) FgxWyg1Xm #[[(hidden) DY6wPnICE]] #[[(hidden) unlH_9R0B]] [[(hidden) JkF9j8PEK]] [[(hidden) 7_b216tQu]]
        
        (hidden) 3UhYBfam0 [[(hidden) WgQQoInBs]] [[(hidden) 9-UljKXNz]]
        
        (hidden) D_Wvo7lU1
        
        (hidden) oH8URqn1D
        
        (hidden) GI6rysYU_
        
        (hidden) iFl8PmRdO
        
        (hidden) msdBzRZ0P
        
        (hidden) 4xvYZ-rgt [[(hidden) sJRzxsUIN]]
        
        (hidden) OLp_8EcCt
        
        (hidden) sImn6BH-b
        
        (hidden) ndrWjN5T4
        
        (hidden) 6q69TUWWW
        
        {{[[TODO]]}} (hidden) 4Ryf6ATW9 #read
        
        (hidden) tKnJo9JMM #[[(hidden) 96vUKjfSO]]
        
        (hidden) WwkbY5FhO
        
        (hidden) 7xjB4OZm-
        
        (hidden) EUs9-Le8B
        
        (hidden) _N1HYfscy [[(hidden) 9VuMlPML-]] [[(hidden) A0IvF-J8w]] [[(hidden) ZeL7wL5Y-]]
        
        {{[[TODO]]}} (hidden) hKiZtMXyu [[(hidden) BC3_6P1lo]] [[(hidden) ZeL7wL5Y-]]
        
        (hidden) PT8iAXcrD [[(hidden) ZeL7wL5Y-]]
        
        (hidden) RA1LlTaH8 #[[(hidden) 4mVW5p7mL]]
        
        (hidden) FeJRXiERG
        
        (hidden) -fIbhBFaD
        
        (hidden) MzxeR7hK8 [[(hidden) -dshiFmVz]]
        
        (hidden) ersv4AT3S
        
        (hidden) 8Gz6BTAdr #[[(hidden) JEA40P17v]] #[[(hidden) GCtYttGPw]]
        
        (hidden) 7N67jY0Mp
        
        (hidden) Vg2jIaIdL
        
        (hidden) XgowM4y1s
        
        (hidden) MQUhSUmVo
        
        (hidden) nhV2cTHcO [[(hidden) 37rJr30_V]] #[[(hidden) 4mVW5p7mL]]
        
        (hidden) VViy5GAxG
        
        (hidden) CZb8uPELg
        
        {{[[TODO]]}} (hidden) AoMI9ODmZ #read
        
        (hidden) yc9QvtC6L
        
        (hidden) 20kF6hOHf #[[(hidden) NZ49MYFWb]] #[[(hidden) 4mVW5p7mL]]
        
        (hidden) qK49fguzB [[mixed signals]] #[[(hidden) JEA40P17v]]
        
        (hidden) jkpsBkjJT
        
        (hidden) bqkWX_59i
        
        (hidden) LiSXhVosV
        
        (hidden) FAG-HVI9X #[[(hidden) 7c2C8PgIV]]
        
        (hidden) MCUiHhk82 [[(hidden) hT46zHpxs]] [[(hidden) PdcGVK8es]] #[[(hidden) KkaOnBs0U]] [[(hidden) e1uk5UrBJ]]
        
        {{[[TODO]]}} (hidden) tI5kbn8Ym [[(hidden) 27cjqbkWh]]
        
        (hidden) -de4T4NaS
        
        (hidden) 5ZiQluoPm
        
        (hidden) xyl0fUsbp
        
        (hidden) bjAAbl2ml
        
        (hidden) zIA-I_MPx
        
        (hidden) 7C3gGuI58
        
        (hidden) ipRm6AaWD
        
        (hidden) ayS-y7uzo [[(hidden) IlSJwZCeN]]
        
        (hidden) WZJb2T6VY
        
        (hidden) Rm7jdy7LM
        
        (hidden) ou20kZISg
        
        (hidden) 2Ei6ZwpUW
        
        (hidden) D6z8h-wQx
        
        (hidden) BhUBl59N1
        
        (hidden) ERg1zTzDn
        
        (hidden) dC9Cczb05
        
        https://docs.graphite.dev/
        
        {{[[TODO]]}} #watch https://www.youtube.com/watch?v=pP0AYz9ttC0
        
        hmmm. very different approach to the local workflow.
- {{[[TODO]]}} `--sync` will be very interesting. we'll have to tackle both local & remote changes (local at first, remote later, if ever possible)
  - something like 3-way (or 4-way? maybe not, if successfully `--apply`ied) merge
    - cc [[(hidden) xoxbt62pS]]
      - https://github.com/mhagger/git-imerge
  - no clue how to do properly tbh, will just need to experiment a lot
    - esp., again, if both local __and__ remote got modified.
      - in general, the remote should __not__ be modified by anyone else than you. but, maybe still interesting to tackle, when we have a lot of extra time.
  - {{[[TODO]]}} would also enable us to explore the workflow of jumping between branches & editing there directly, instead of currently doing everything mid-rebase (either moving commits in git-rebase-todo file, and/or marking commits with `edit` / just `break`ing)
    - {{[[TODO]]}} also realized that probably it's not common to have an alias in git like i do for `git log` with the nice graph view -- could add another command just for doing that
- {{[[TODO]]}} if user doesn't provide the `initialBranch`, could launch `fzf` to allow them to search for the `initialBranch` (or `initialCommittish`, when implemented)
  - tho idk which default i want -- to print help, or to do this.
    - could make configurable.
      - still, which one should be the initial one?
  - could even keep a list of previously used `initialBranch`es for better initial results
    - could have them them ordered by number, so you could input the number & that's it
- {{[[TODO]]}} for extracting a branch from the stack, could simply allow dragging the commits & the branch-end to the very beginning of the stack, i.e. before the "branch-end-initial"
  - {{[[TODO]]}} could also make as a command / humanOp
- {{[[TODO]]}} something [related](((4-ipzrx1j))) for created a new branch-end __after__ the branch-end-last.
- {{[[TODO]]}} could have "sugar" options (i think mentioned this before, for the `reword` functionality)
  - {{[[TODO]]}} allow to swap the order of commits (& branches) in the `git-rebase-todo` file
    - would be useful. i'm often confused
    - but, gotta be careful w/ not giving people the wrong habits, because you could easily forget this / get confused when doing a regular rebase
      - maybe would incentivize users to use `git-stacked-rebase` as the default, i.e. to replace the regular git-rebase with it? 👀
        
        {{[[TODO]]}} could be achievable, if we provide a way to directly pass in git rebase's commands to the underlying git rebase!
        
        doable. already had an idea for `--` to forward args to the regular rebase
        
        but would be best if this isn't needed.
        
        {{[[TODO]]}} we could have a list of git rebase's supported args, so that we pass them in automatically
        
        {{[[TODO]]}} and only if there's a new command in git rebase, only then we'd error out, and
        
        1. print an error to ask to report this issues so that it can get fixed for everyone
        
        2. print info that for a quick escape hatch, can use `--` to forward the command to git rebase directly
        
        re: ((sjdQWUl_U))
        
        this is not the best, because say i cannot contribute anymore & there's no way for anyone to update the list. then it becomes a burden for everyone.
        
        {{[[TODO]]}} instead, would be best to get this list of supported arguments directly from git rebase
        
        {{[[TODO]]}} or maybe we just forward them, and then let git rebase error out itself?
        
        {{[[TODO]]}} otherwise, some community-sourced method?
        
        or at least a dev could have a list of extra args by providing it themselves. but probably worst ux
  - [[additional research]]
    - {{[[TODO]]}} #read "a better model for stacked (github) pull requests"
      - https://0xc0d1.com/blog/git-stack/
    - {{[[TODO]]}} #read "stg-rebase"
      - https://stacked-git.github.io/man/stg-rebase/
        
        https://github.com/stacked-git/stgit/
      - {{[[TODO]]}} #read https://news.ycombinator.com/item?id=27305521
        
        {{[[TODO]]}} explain in the README clearly that [[git-stacked-rebase]] is simply `git-rebase`, but now instead of only commits, you can manipulate branches as well.
    - {{[[TODO]]}} #read "stacked pull requests" (manual)
      - https://www.michaelagreiler.com/stacked-pull-requests/
- {{[[TODO]]}} when we mature, at least in [[level 1 of gsr]], advertise at https://stackoverflow.com/questions/61216739/how-to-rebase-with-multiple-stacked-branches-in-git
- {{[[TODO]]}} fix issues w/ different node versions
  - {{[[TODO]]}}
  - [[(hidden) qbhpV9DHv]] outdated build...
(hidden) EeWzKDm5M
(hidden) 5I84pwSDk
(hidden) hCOZwL4J9
(hidden) JFLT2_iYn
(hidden) VTGxUTGfF
(hidden) 7DnXC2n3Z
(hidden) 0v7B1VzLI

words:	1221 + 273 = 1494
last update: