Git Merge Conflict Finds Types
Had a git merge conflict in my @rustlang project. Searched for `>>>>>>>` to find the conflicted lines, but found several types instead.
A screenshot of a humorous tweet about encountering a Git merge conflict in a Rust project. The joke is that searching for Rust conflict markers finds Rust type syntax instead, playing on the overlap between Git markers and Rust code.
- @profunctor_io / 4118 2020-03-07
- Type
- image
- Size
- 800×357 · 41.5 KiB
- Mood
- технический юмор
- Language
- en
- Added