Is there an update on this? Zoria, if you think some unintended changes snuck into the last patch, I can roll it back, and we can merge in one change at a time, carefully reviewing each one.It's not a big issue in itself, but why did it happen? Were you bringing in changes from an out-of-sync repo? I only noticed that because it's obvious and it's easy to see why it happened. Who knows what else might have broken?
]Originally Posted by DarkDragon
I'm starting clean with a pull from the AGN GH branch to my local filesystem. I think that my fork was corrupted by merges from two sources, but I do not know how easy it will be to mend it. I may need to do some fiddling. This is just another reason that better branch management would help. If I could add a branch to the AGN repo, it would also appear on my fork, and then I could fold it in without touching this mess.
Is there a --hard version of git push?
http://www.zoriarpg.com/zc/LoE_Userbar.png http://zoriarpg.com/zc/EiyuuUserbar.png
http://www.zoriarpg.com/zc/CIS_Original.pnghttp://www.zoriarpg.com/zc/CIS_II_Userbar.png
Latest ZC 2.53 (Win32) | (Technical Specification | Changelog)
Latest ZC 2.55(Win32) | 2.55 Modules | (Techical Specification | Changelog)
ZC Source Code | ZClaunch Source Code
Featured Scripts & Headers: RPG.zh ( v. a0.97.1 ) ( RPG.zh Thread ) | Zelda 3 Thief's Town Treasure Chest Minigame (ffc) | Bobomb (enemy)
ZScript & ZC-Related Pastebin | ZC Dev & Builds | ARCHIVED ZC Dev & Builds | YouTube Channel | Quests and ZScript Repository
All of the code that I create and publish here is free for use, modification and distribution under the GPL v2.0, or v3.0 where applicable.
There are currently 2 users browsing this thread. (0 members and 2 guests)
Posting Permissions
Reply With Quote