Where is that Nix girl? I want her to know I don’t want to hurt you guys.” Jules questioned. They think people like us should know our place and not leave. My friend and I have been trying to get off of this stupid planet our entire lives but we can’t because the R.O. It makes them sound like they are good people.” The girl said. Honestly I don’t know why they are named that. She doesn’t want to risk anything.” Scarlett explained. The girl who knocked you out, her name is Nix, she was just scared of you because we are currently running from the Radient Ones. I tried to make sure you were okay while you were unconscious. “Hello?” The girl asked, “Who are you?” “I am Scarlett. “Well, I’ll leave you two be.” She said as she walked out the door to Apollo’s tent where the girl was. “Maybe she can just share with Leo.” Scarlett suggested. “Where will she sleep tonight? Did you think about that?” Scarlett questioned. I told her to sleep because that’s her escape, but her sleeping bag is destroyed so I said I would keep her warm.” Oli explained. “That was too many words for me to catch all of that. “Apollo found these mushrooms and decided to cook them and he told Nix to be the taste tester and so the ate one and then she fake died so I checked her pulse and I knew she was alive and faking it so I told them she was dead so they dug a grave and we had a funeral so I put Nix in her sleeping bag and put her in a grave they made and I left for a second and when I came back she was burried alive so I dug her out and she was unconscious and she came back to life and I’m helping her not die.” Oli rambled. “How on earth could that even happen.” Scarlett said sarcastically. “We aren’t! Nix and I were pulling a prank and it went terribly wrong.” Oli replied defensively. “I didn’t think you two were a couple.” She smirked. She opened the door to see Nix asleep on Oli. When she made it to the tent, it was quiet. She thought Leo seemed really tense, which was weird because he was usually like a calm giant. I’m going to get Nix.” Then Scarlett walked through the jungle to Nix and Leo’s tent. “I don’t know! You want to help?” Scarlett interrogated. “Why on earth are you asking Nix?” She’s the one that knocked her out!” Leo wondered. “That girl is waking up!” Scarlett yelled. “Where is Nix?” Scarlett asked in a panicked tone. “SHES WAKING UP!” “I SEE THAT.” “WHAT DO WE DO?” “IM NOT SURE.” “GET NIX.” “SHES THE ONE WHO KNOCKED HER OUT THOUGH.” “SHES TALKED TO HER BEFORE THOUGH.” “OKAY!” Scarlett ran to the fire where she thought everyone would be. The end result is unchanged.“SHE MOVED.” Screamed Beth. 3be4d97 seen on GitHub) don't show up in the text file to drop. Tried it back to 0facf00, some commit long before I forked, and my merge commit hashes (e.g. trying to do a git rebase -i back to some point - doesn't seem to work.deleting/remaking master - is that safe, particularly with GitHub?.I've read various other questions and am not quite clear whether I'm best: This seemed ugly to me, so I did some reading, particularly the article Stop using 'git pull': A better workflow, and I've switched to rebasing/fast-forwarding.īut what's the best way to clean up an existing merge commit history in this situation? It touches a few of my feature branches too (see: feature/JammingHaywire), and I don't want to be submitting a PR where the meaningful commits are drowned by meaningless merge commits. No files changed it's merge commit messages. My problem is on my forked master: This branch is 15 commits ahead of endless-sky:master. Each feature I develop has a branch to itself, created from my master, and I use my own (local) alpha and (pushed) beta branches for combining my features to test/play. My fork's master is supposed to mirror the upstream/master.I started using GitHub Desktop, but am beginning to switch to the command line. I'm trying to have a good Git workflow for contributing to an open source project (Endless Sky), but learning as I started out I've not ended up with a clean history. This branch is even with endless-sky:master. Git remote add-url endless-sky /url/of/endless-sky
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |