Learn More
Resend Email
40
yousefjb
10y

A : "what the funk is wrong with git ! why there are conflict!!"
Y: "let me see, hmm .. just press ctrl + disc.."
A : "what are you doing ?"
Y : "discard! they are gone. now you can try again in different branch"
A : "I didn't commit !! this my work of two weeks!!!"
Y : " ..... "
Y : *sneak away*

undefined
Favorite
Ranter
Comments
  • 19
    10y
    HOW DO YOU NOT COMMIT FOR 2 WEEKS?!
  • 5
    10y
    actually I am Y
  • 3
    10y
    deserved it
  • 1
    10y
    No nigthly backups on work dir :O

    well no commit for two weeks is almost worst or no.

    backups!! ;)
  • 1
    10y
    How did he manage to have a conflict without committing before pulling?
  • 1
    10y
    I have had similar situations with co-workers. I normally have them backup their entire source directory before I start messing with it. Just in case to prevent stuff like that 😏
  • 0
    10y
    @ryuu I don't know, I guess they have stashed them or something. luckly I found a solution at SO that show you how to return a dropped stash .. the number of ways you can ruin git is countless.
devRant © 2021 Hexical Labs LLC
Privacy Policy  |  Terms of Service
Add Comment