Tried it back to 0facf00, some commit long before I forked, and my merge commit hashes (e.g. The Archon is currently the strongest vanilla ship, but it can't be obtained wi.
#Best endless sky ships how to
trying to do a git rebase -i back to some point - doesn't seem to work. This video shows you how to capture one of the Drak Archons from Endless Sky.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. Others are basicly fuel pods, mass expansions, batteries and other goodies that would fit.
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 kommentar(er)
