LogFAQs > #942015105

LurkerFAQs, Active DB, DB1, DB2, DB3, DB4, DB5, Database 6 ( 01.01.2020-07.18.2020 ), DB7, DB8, DB9, DB10, DB11, DB12, Clear

Topic List	Page List: 1
Topic	Why is GitHub always deeply awful to do anything in.
chlc3d 07/12/20 1:46:22 PM #16:	Judgmenl posted... Yea that's what happens when you use Windows and software you don't understand. I have no idea what "github desktop" is. This isn't very helpful. If you don't know what's going on, it's ok to say nothing, lol. This is clearly a git problem and not a windows problem... shadowsword87 posted... For the record, I use github desktop, because that's what I was recommended to do. Basically, I can't use the "Fetch Origin" button because it doesn't update the sprites for the game game I'm using, even though it's fine because it doesn't mess with all of sprites. It's just that if I adjust anything sprite-related suddenly my oldass master reverts everything. Same thing with mapping, which I do use. So I just don't use it, fine I asked around and got told what I can do. Then I used the verb `git pull upstream master` so I just completely synch up my master to the game and branch, then make my changes, and make my PR that way. Somehow my changelog got fucked up, I have no idea what is wrong, but I just copied the folder manually from the website itself, and that worked. But now all of my shits not happy, and I can't nuke my local copy to fix it either. I'm almost positive I pushed something to my master, and not from my branch, but I have no clue how to just synch it up. Then I go "fine, fine, I'll just try and learn this stuff myself", and the first video was the devs explaining that the mac version and the windows versions have different stuff, and they can't explain anything in any timely fashion. So I'll read documentation, and each verb has 50 tags on it and I can't understand what the hell its even supposed to be doing. Can you clone the repository again from scratch and just copy the files you changed over to the new copy? It sucks, but it's really tough to diagnose git issues over text so it's probably the best advice I can give lol. Not sure if this is what you meant by "can't nuke my local copy to fix it either", so sorry if there's some reason I missed here. If you can't do that, you might be able to understand more about the state your master branch is in (e.g. whether you accidentally commited something on master) with a command like `git diff master origin/master` or just a `git log` on both. If you have extra commits in your master, you can do `git reset --soft HEAD~<number of commits>` to undo them and re-stage the changes So I'll read documentation, and each verb has 50 tags on it and I can't understand what the hell its even supposed to be doing. Yeah, git's UX is utterly miserable and the different GUI clients do little to improve it. --- voted world`s most epic gamer 2009, 2012-2013, 2015-2019 Al Qaeda eSports Team Captain <cite>chlc3d posted [p:942015105] in Why is Git... [t:78840925]...</cite> <quote>Judgmenl posted... </cite> <quote>Yea that's what happens when you use Windows and software you don't understand. I have no idea what "github desktop" is.</quote>This isn't very helpful. If you don't know what's going on, it's ok to say nothing, lol. This is clearly a git problem and not a windows problem... shadowsword87 posted... </cite> <quote>For the record, I use github desktop, because that's what I was recommended to do. Basically, I can't use the "Fetch Origin" button because it doesn't update the sprites for the game game I'm using, even though it's fine because it doesn't mess with all of sprites. It's just that if I adjust anything sprite-related suddenly my oldass master reverts everything. Same thing with mapping, which I do use. So I just don't use it, fine I asked around and got told what I can do. Then I used the verb git pull upstream master so I just completely synch up my master to the game and branch, then make my changes, and make my PR that way. Somehow my changelog got fucked up, I have no idea what is wrong, but I just copied the folder manually from the website itself, and that worked. But now all of my shits not happy, and I can't nuke my local copy to fix it either. I'm almost positive I pushed something to my master, and not from my branch, but I have no clue how to just synch it up. Then I go "fine, fine, I'll just try and learn this stuff myself", and the first video was the devs explaining that the mac version and the windows versions have different stuff, and they can't explain anything in any timely fashion. So I'll read documentation, and each verb has 50 tags on it and I can't understand what the hell its even supposed to be doing.</quote> Can you clone the repository again from scratch and just copy the files you changed over to the new copy? It sucks, but it's really tough to diagnose git issues over text so it's probably the best advice I can give lol. Not sure if this is what you meant by "can't nuke my local copy to fix it either", so sorry if there's some reason I missed here. If you can't do that, you might be able to understand more about the state your master branch is in (e.g. whether you accidentally commited something on master) with a command like `git diff master origin/master` or just a `git log` on both. If you have extra commits in your master, you can do `git reset --soft HEAD~<number of commits>` to undo them and re-stage the changes <quote>So I'll read documentation, and each verb has 50 tags on it and I can't understand what the hell its even supposed to be doing.</quote> Yeah, git's UX is utterly miserable and the different GUI clients do little to improve it. --- voted world`s most epic gamer 2009, 2012-2013, 2015-2019 Al Qaeda eSports Team Captain</quote> ... Copied to Clipboard!
Topic List	Page List: 1