git
Notes on Electron, JavaScript and the web, newest first.
- Avoid Git Merge Conflicts During a Big RebaseYou need to rebase a feature branch you worked on weeks ago. Merge conflicts everywhere. But: There's hope. Use "git merge --squash".1 Sep
- Dependencies and Git branchesGit worktrees: Work in multiple branches at the same time. Quit reinstalling dependencies when you checkout different branches.17 Apr