mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-04-25 06:06:03 +03:00
Labels
No labels
Atrac3+
Audio
CPU emulation
D3D11
D3D9 (removed)
Depth / Z
Feature Request
Font Atlas
GE emulation
Guardband / Range Culling
HLE/Kernel
I/O
Input/Controller
MP3
Multithreading
Needs hardware testing
Networking/adhoc/infrastructure
No Feedback / Outdated?
OpenGL
PGF / sceFont
PSMF / MPEG
Platform-specific (Android)
Platform-specific (Windows)
Platform-specific (iOS)
PowerVR GPU
SDL2
Saving issue
User Interface
Vulkan
arm64jit
armjit
armv6
x86jit
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/ppsspp#1585
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Originally created by @solarmystic on GitHub (Sep 22, 2013).
Original GitHub issue: https://github.com/hrydgard/ppsspp/issues/3879
Issue is as stated in the title.
Easiest problem repro is just to update your submodules (git submodule update --init) after performing a git pull -v --progress "origin".
Main cause is that the particular pull request reverted the submodules version to use really old and outdated ones.
Thanks for reading.
@dbz400 commented on GitHub (Sep 22, 2013):
I think it is my fault that previous commit merged with old lang/native
@dbz400 commented on GitHub (Sep 22, 2013):
Previously when i'm trying to merge my old commit with latest source .I used the following commands but somehow got those old lang/native etc merged as well
git checkout master
git fetch upstream
git checkout patch-1
git merge upstream/master
git push origin patch-1 -f
@solarmystic commented on GitHub (Sep 22, 2013):
Temporary solution for now would be to just do a git pull but do not follow up with a git submodule update, which will pull in the wrong submodules.
A fix would just involve updating the lang/native/pspautotests submodules back to the latest ones again.
@hrydgard commented on GitHub (Sep 22, 2013):
Fixed it.
@unknownbrackets commented on GitHub (Sep 22, 2013):
@raven02 just use git rebase upstream/master, git submodule update.
But, you can always double check to see.
-[Unknown]