Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding my new joke #1059

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
22 changes: 22 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,25 @@ An SEO expert walked into a bar, pub, liquor store, brewery, alcohol, beer, whis

Why did the two functions stop calling each other? Because they had constant arguments.

Why couldn’t the confirmed bachelor use Git? Because he was afraid to commit!

Adding line from feat-joke

adding new line to pull

----- creating conflict -------------

adding new line third time time to pull and update my my-joke branch

Adding line to stash

----- creating conflict from my-joke -------------
----- creating conflict from my-joke -------------
----- creating conflict from my-joke -------------
----- creating conflict from my-joke -------------
----- creating conflict from my-joke -------------

----- creating conflict from feat-joke -------------

---- resolved conflict all good can push -----