I'm having an issue looking up my git history from Xcode. I've been using it for a couple of years and it's been working fine. But recently, I created my 'F1' branch from my 'develop' branch. After working on it for a few days, I decided to branch off from 'F1' and created a new 'F2' branch. After a few days, I was done, and then (unwisely, maybe) did a merge from F2 into 'develop'. At first, this ran into a merge conflict, so I resolved it and then did a git commit and push (from Terminal). Unfortunately at this point, XCode isn't showing me all the history of commits that I had made in F1 and F2 in the develop branch; it just shows the last commit made before I created the F1 branch, and then the commit I from after I resolved the merge conflict. But when I look at 'git log' from Terminal, it shows the correct history as I would expect it, including all the commits in the F1 and F2 branches.
Is there any way to reload the git history for Xcode? Or is there something else at play here?
This is what the 'git log' looks like, in develop
MacBook-Pro:SimpleList zs$ git log develop
commit a380a1f7b59e689589e43e94b5af5ac9de802d78 (HEAD -> develop, origin/develop)
Merge: 1813d694 a4fee2cb
Author:
Date: Wed May 30 15:42:27 2018 +0500
Merge branch 'CJ-420-AddSubscriptions' into develop
commit a4fee2cb2ef3b9495d2a379747dfbcfc01054d99 (origin/CJ-420-AddSubscriptions, CJ-420-AddSubscriptions)
Author:
Date: Wed May 30 15:42:05 2018 +0500
- commit something to try and merge
commit 1813d694159d1cee3a63dac95ab50db6910568e6
Merge: 6de916bc 18100bff
Author:
Date: Wed May 30 15:07:32 2018 +0500
merging CJ420-Universal branch into commit
commit 18100bff71c42ac30328337b14bb6db44ba4f8b9 (tag: CJ-420-Universal-Release, origin/CJ-420-UniversalApp, CJ-420-UniversalApp)
Author:
Date: Wed May 30 00:49:43 2018 +0500
- adding different icon set for iPhone. updated version numbers
