How to cancel checkout in Xcode?

Question

I have these commits on my project:

Commit 1
Commit 2
Commit 3
Commit 4
Commit 5

I wanted to see something in Commit 3, so on source control I choosed "Checkout" on Commit 3. It revert to Commit 3.

But now in the list of commits I can't see Commit 4 and Commit 5 anymore! Does it mean I lost all my work? Is it really so simple to lose everything?

what platform are you using to make VersionControl? Bitbucket? Github? — Gustavo Vollbrecht, Feb 06 '19 at 17:50

Gustavo Vollbrecht · Accepted Answer · 2019-02-06T18:23:30.547

1

No, you did not lose all your work. No it is not that simple. Once you commit something, it should be very easy to recover it.

You can always go to your Version Control platform, look the commit history on a branch, pick a commit ID and revert to it.

You can try: git reflog and get the ID.

Then you can checkout to that ID, check on how to do it on this answer: https://stackoverflow.com/a/34777222/8869493

edited Feb 06 '19 at 18:23

answered Feb 06 '19 at 17:52

Gustavo Vollbrecht

3,188
2
19
37

Thanks for your answer, but the last item in the history is "commit 3". The filter is on "All items". Could it be because I only have a local repository ? – Eric Feb 06 '19 at 17:55
What do you see when you `git log` on terminal, at your project folder? – Gustavo Vollbrecht Feb 06 '19 at 17:56
Same: all commits until Commit 3 – Eric Feb 06 '19 at 17:58
Try: `git log --all` – Gustavo Vollbrecht Feb 06 '19 at 17:59
Same: all commits until Commit 3 :( – Eric Feb 06 '19 at 18:03
check this answer: https://stackoverflow.com/questions/5737579/getting-the-full-git-log-after-rolling-back-to-a-previous-version – Gustavo Vollbrecht Feb 06 '19 at 18:05
Looked at it. Made 'git checkout master' to revert to my previous Commit 5, and now I got back to the very first commit, three months ago ! All commits disappeared, can't believe it ! – Eric Feb 06 '19 at 18:18
Also check this one: https://stackoverflow.com/questions/2427288/how-to-get-back-to-the-latest-commit-after-checking-out-a-previous-commit/2427389 – Gustavo Vollbrecht Feb 06 '19 at 18:18
Don't panic, every commit can be recovered. – Gustavo Vollbrecht Feb 06 '19 at 18:19
Also, this: https://stackoverflow.com/questions/10099258/how-can-i-recover-a-lost-commit-in-git – Gustavo Vollbrecht Feb 06 '19 at 18:21
Updated my answer – Gustavo Vollbrecht Feb 06 '19 at 18:23
Read and tried everything from various posts. Downloaded Github desktop to have better view, history is empty now, got back to my very first commit. Seems that making checkout from xCode reverts back and delete most recent work... Just have to kill myself! – Eric Feb 06 '19 at 18:34
what do you see when you `git reflog`? – Gustavo Vollbrecht Feb 06 '19 at 19:00
Can't see the commit Id in xCode neither in Github desktop, but found it directly in file `.git/logs/HEAD` under project account. Then applied `git reset HEAD --hard ` and alleluia went back to last commit! Thanks for your help and patience. – Eric Feb 06 '19 at 20:03

score 0 · Answer 2 · answered Feb 06 '19 at 19:54

If all you want to do is see something in Commit 3, double-click Commit 3 in the list of commits. Xcode's editor will show you a list of all the files you modified in that commit. Select a file to see the changes you made to that file.

Checking out commits is a bad idea. When you check out a commit, you end up with a detached head, which means the repository has no current branch. With no current branch, you are going to run into problems committing to the repository. A better alternative to checking out a commit is to create a branch off that commit.

To get back to Commit 5, check out the branch that has Commit 5.

How to cancel checkout in Xcode?

2 Answers2