forked from eyluo/linux-bootcamp
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathexample.txt
More file actions
22 lines (15 loc) · 694 Bytes
/
example.txt
File metadata and controls
22 lines (15 loc) · 694 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
<<<<<<< HEAD
Once upon a time there was a good programmer who used git. He committed
regularly and wrote useful messages.
One day, he wrote buggy code! But thankfully he was able to reset to an
earlier commit. Instead of having to rewrite his entire project, he was
able to just restart the buggy feature.
In the end, he died.
=======
Once upon a time there was a programmer. But he didn't ever use git! After all,
he was a good programmer and didn't need to.
But one day, he made a mistake and wrote buggy code. He searched for hours for
his bug, but couldn't figure it out.
In the end, he died, as the good programmer did.
Morale: programmers are not immortal
>>>>>>> realistic_ending