iamwithnail
Well-Known Member
Noooooooooooo
Today I have mostly been using ${insert development technology here}
- Thread starter fractionMan
- Start date
dervish
if you flibble when you wibble, don't wobble
Really? I set up a docker instance for a minecraft server and it took about 2 minutes. I was surprised at the lack of configuration needed.
iamwithnail
Well-Known Member
Yeah that's what I ended up doing. Was trying to run it from the pocket mine repo and the docs are just terrible. ''first, install the PHP dependencies for pocket mine" but doesn't tell you what they are. Worked my way through that by getting the error messages, then discovered that I need to have compiled php with zthreads, which it didn't tell me. Gave up, did some more googling and ran the docker one, which took a couple of minutes. That was an evening well spent. 
iamwithnail
Well-Known Member
Not being a dick, genuine question - how did you get to 2018 doing anything that touches tech without git?
existentialist
Tired and unemotional
I must admit that I tend to use Git in a rather monkey-see monkey-do way. I keep meaning to have a proper play, but it tends to be an adjunct to whatever else I am actually doing to scratch the itch of the day, rather than being an itch in its own right...
iamwithnail
Well-Known Member
I actually got shown some next level stuff in git today- staging chunks interactively and cherrypicking things, very cool and useful. i'm a bit 'these are the arcane black magick commands i use' with it, but it's incredibly powerful.
I work on big deployed systems now, so this obviously doesn't apply, but even when i didn't have that requirement, using git saved my arse so manytimes while i was learning. It was like having infinite save games for your code.
I work on big deployed systems now, so this obviously doesn't apply, but even when i didn't have that requirement, using git saved my arse so manytimes while i was learning. It was like having infinite save games for your code.
FridgeMagnet
Administrator
Some of the web devs in the place I work (not in my office I hasten to add) weren’t using git until earlier this year, and then I suspect only because the company standardised on it. Sometimes they didn’t use any version control at all.
FridgeMagnet
Administrator
Everybody does, apart from a few weirdos. I probably know about five git commands. “Rebase”, what you say? What is this mumbo jumbo?
iamwithnail
Well-Known Member
I impressed in my last interview by talking about git bisect. I actually don't know how to use it, but I read enough to chat in my interview about it and blinded them with science.
dervish
if you flibble when you wibble, don't wobble
I haven't been developing long, and I've entirely learnt by solving the problem in front of me, not really worked with developers so haven't had the advantage of someone to explain stuff. My current project is a script to automate the migration from win 7 to 10 and has had many, many changes so it's become necessary. My day to day job is not coding, but I do use powershell to write small apps and scripts, as I'm doing it solo I've not needed any of the collaborative functions of things like git, I've just started using it in VSCode and with gitlens it's awesome.
dervish
if you flibble when you wibble, don't wobble
Yep, if it works...
RoyReed
Must fly!
Pretty much what I've always done.
iamwithnail
Well-Known Member
it's quite interesting to find out about the wider uses, I work in (non .net) software so everything is linux/mac/git, i forget that there are different environs - git didn't work terrifically well on windows last time i had to use it, so of course that's a thing. Doh. That version control makes me v twitchy though 
Doh. That version control makes me v twitchy though You might be interested in Windows Subsystem For Linux - basically Linux running ontop of windows accessible via the command line.
iamwithnail
Well-Known Member
Oh nice. Given how janky my Ubuntu is running with the Nvidia card I might give that a bash, pun intended.
Fez909
toilet expert
There's a project on github that aim's to get your Ableton projects into VCS, specifically git (naturally).
I've not played with it yet, but it's something I've both been meaning to do, and actually need to do. Lost part of the best tune I've ever made recently due to a dodgy save/workflow.
And even above, re: not need the collab features...I think git's worth learning anyway as it's so ubiquitous now, and can work perfectly fine as a solo dev. Branches are one huge benefit.
1. Make a change
2. Commit
3. Wonder, "if i did x would it..."
4. Make a branch for x to test out.
5. If it works, great, if not, delete yer branch.
So simple to do, and while it could be done with any other VCS, it seems really simple in git. And working solo, you don't even need to care about merging back in. Just create a feature branch for experiements and if it works, that's now your "master".
iamwithnail
Well-Known Member
No no, if your feature branch works, do a.pull request and merge it into master! (I get what you're saying, but it's definitely cleaner/easier to branch from master)
Branches were revolutionary for me when I discovered them
Branches were revolutionary for me when I discovered them
Fez909
toilet expert
I'm confused by pull requests. Are they a git hub feature, or native to git?
I've used git a lot but not really git hub.
I don't see why you'd need a pull request as a solo dev though. If I understand them correctly, they're a way of saying to the upstream project that you have changes for them, and works they like to pull them into their project?
If you're solo, there is no "their" project. Or It's yours. So just merge it in?
FridgeMagnet
Administrator
Not branching off master is the quickest way to get really confused IME. It’s less of an issue if it’s just you but that’s because it’s just a pain and not a screaming nightmare of multiple branches by multiple authors.
iamwithnail
Well-Known Member
I'm confused by pull requests. Are they a git hub feature, or native to git?
I've used git a lot but not really git hub.
I don't see why you'd need a pull request as a solo dev though. If I understand them correctly, they're a way of saying to the upstream project that you have changes for them, and works they like to pull them into their project?
If you're solo, there is no "their" project. Or It's yours. So just merge it in?
Yeah it's a GitHub thing, I alwqys forget that. PRs are really nice clean way to get clear merges back into master, but you can just do it by merging in your main branch. The pull request is mainly for multiple collaborators, as you describe.
Fez909
toilet expert
While we're talking git...one thing I've always struggled to sort when I was maintainer for a project is knowing which branches have been merged.
With pull requests, I can see how easy it is, but we weren't using git hub. We self hosted.
I prefer squashed committ into master, so would always test the feature branch then squash merge, but you lose the ability to do git master --contains <commit> then.
I could/should delete the branch immediately after the squash merge but for reasons that didn't always happen.
What now?
With pull requests, I can see how easy it is, but we weren't using git hub. We self hosted.
I prefer squashed committ into master, so would always test the feature branch then squash merge, but you lose the ability to do git master --contains <commit> then.
I could/should delete the branch immediately after the squash merge but for reasons that didn't always happen.
What now?
iamwithnail
Well-Known Member
Git branch --merged master lists all the branches merged into master.
Git branch --no-merge lists all unmerged (into head, in that instance)
If you want to do squash commits and not lose the info then you can branch from feature branch (i.e., make a release branch) and squash commit that into master. The commits that made it up are still in the feature branch, but then you have loads of feature branches knocking around. It's easy to see what's merged though.
Also, if you don't have it, gitk is a great tool for stuff like this and works on multiple platforms.
Git branch --no-merge lists all unmerged (into head, in that instance)
If you want to do squash commits and not lose the info then you can branch from feature branch (i.e., make a release branch) and squash commit that into master. The commits that made it up are still in the feature branch, but then you have loads of feature branches knocking around. It's easy to see what's merged though.
Also, if you don't have it, gitk is a great tool for stuff like this and works on multiple platforms.
iamwithnail
Well-Known Member
Speaking of git, as we were, I finally get the point of git rebase.
Today (and recently) i've been using GitLab, which is wellllll nice. It's an enormous infrastructure project so there's lots of terraform and kubernetes in there as well.
Today (and recently) i've been using GitLab, which is wellllll nice. It's an enormous infrastructure project so there's lots of terraform and kubernetes in there as well.
Similar threads
