git rerere forget {file_path}
git checkout --conflict merge {file_path}
View AmongUs.swift
class AmongUsGame { | |
init(players: [Player]) { | |
self.players = players | |
listenToPlayerEvents() | |
} | |
func start() { | |
assignTasks() | |
} |
View git-discard-rerere-saved-resolution.md
View gitworkflow-recipe-index.md
Train rerere
Download rerere.train.sh
:
mkdir ~/source
cd ~/source
git clone https://github.com/git/git.git
View gitworkflow-topic-dependency-update.md
Scenario
- Topic-B depends on Topic-A
- Topic-A has updates
- Topic-B want Topic-A updates by replacing old merge to have clean graph
(topic-b)$ git tag "outdated"
(topic-b)$ git reset --hard master #if master is parent of Topic-B
View git-snippets.md
TAGS
- List all tags:
git tag -l
- List all tags in remote (eg: origin):
git ls-remote --tags origin
View commit-zen.md
Commit Format
<TYPE>(<COMPONENT/MODULE>) [JIRA-000] Short message
# Long message
# BREAKING-CHANGES:
View git_push_different_branchname.md
git push origin <local_branch>:<remote_branch>
git push --force-with-lease origin <local_branch>:<remote_branch>
View git-rebase-interactive-sublimetext.md
Open Terminal and execute the ff:
ln -s /Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl /usr/local/bin/sublime
git config --global core.editor "sublime -n -w"
references: https://help.github.com/en/articles/associating-text-editors-with-git
View zip password.md
zip -er "<protected>.zip" "<folder path>"
View FRP Hunt.md
Journey to better understanding FRP
( by @ninokierulf )
created: 2015 April 02
modified:
Collection Pipeline Patterns by Martin Fowler.
After reading- map - to transform item (similar to select?)
- flatten - merge nested
- flat-map - map with flatten 1 level