Yeah, scale and potential impact can really influence how important version control is. The stuff I work on can literally (and usually indirectly) affect hundreds of thousands of gamers.

yeah. I know people do it for personal projects (myself included), but it's really not that important for small-scale projects

@El'endiaStarman Or ya know... The fact that you're creating sandwhiches rather than code.

That definitely impacts the importance of version control

@DJMcMayhem Hahahaha yes.

@El'endiaStarman is it correct that a pull request is a request to merge your changes back into the "main" branch of whatever you're developing, that usually needs the approval of someone else?

(still struggling with git & stuff=P)

Finally found a subreddit with those hilariously bad UI designs:

reddit.com/r/badUIbattles

@flawr Yes. "Please pull my changes into your branch."

Yeah. It's also common for there to be two primary branches, develop and master

develop is where all of the work happens

and then you do a PR from develop into master when you consider things stable and ready to release

When you're on a specific branch, you can copy changes from elsewhere into the one you're on (pull) or copy your changes to somewhere else (push).

@NathanMerrill It's slightly different at my work. Individual PRs for each task get merged into master when they're done, then we have a 1.x release branch with possible variants such as 1.80.0 (and .1, .2, etc for hotfixes if needed). We have several environments that are on different releases at any given time.

Probably worth noting that we effectively manage which release our clients have; they don't (directly) interact with our code at all.

do your branches auto-deploy?

Nope. We have to do that manually. (With the help of scripts, of course.)

I actually expected that at Microsoft, but I actually have found that it is freeing that it doesn't

Agreed; you don't want a breaking bug to automatically go out to production.

it's not just the bugs either: It gives you more control over versioning etc

Oh yeah, that too.

It's typical for production environments to skip several versions at once because our clients (and us) don't want to risk disruption every two weeks.