1

I work in a small group , so I wanted to make a new commit (for the new classes I did ) and then push but before that I did pull all the work of my friends , once it worked after many attempts (at first i got a error message but I don't know what I did but it worked), Now I wanted to commit and push but I couldn't found my classes.

Check here

I work with gitKraken .So I did the pull from "Tex datei nur mit dem wichtigsten" (2 days ago)

How can I get my classes back? Is there any way to do it?

Marlon Abeykoon
  • 11,927
  • 4
  • 54
  • 75
Rachid Ghorbel
  • 11
  • 1
  • Did you commit your changes before you pull your friend's work? – Sazzadur Rahaman Jul 11 '18 at 00:15
  • I don't know about GitKraken, but git normally warns you before pulling from remote to stash or commit your local changes. Did you do either of them? There's a "WIP on master: Auto stash" from the image. – Gino Mempin Jul 11 '18 at 00:27
  • @SazzadurRahaman no i did not commit my chages . – Rachid Ghorbel Jul 11 '18 at 00:34
  • @GinoMempin that "WIP on master: Auto stash" doesn't contain my classes – Rachid Ghorbel Jul 11 '18 at 00:34
  • If you didn't commit or stash your local changes before the pull, then they're most likely already gone/overwritten. Plus, there are already a lot of commits between pulling "Tex datei nur mit dem wichtigsten" and "nix geandert" (which I assume is where you're at) – Gino Mempin Jul 11 '18 at 00:41
  • @GinoMempin so there is no way to recover my classes ?? – Rachid Ghorbel Jul 11 '18 at 00:45
  • This might help: https://stackoverflow.com/a/5788069/2745495. But basically, if you didn't commit or stash (or even stage) anything, then there is no way to recover them. – Gino Mempin Jul 11 '18 at 00:50
  • I don't know any way to recover any un-stashed or un-committed changes. :( – Sazzadur Rahaman Jul 11 '18 at 00:57
  • Gitkraken has done this since day one for me, its auto-stash/unstash feature when pulling is dodgy at best and never was reliable for me. SourceTree has its issues and looks less funky, but is more reliable and faster for me. – CodeCaster Jul 11 '18 at 10:04

0 Answers0