instead of freaking people about by yelling, you're letting them choose to engage. Additionally, you're putting more information in the cw, so people see what you're talking about immediately.

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 14:34

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 14:34

Oct 04, 2018, 14:34

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

Classic Doctor Who :: [ Season 6 ]

Interesting tidbit I just read about The Invasion (which I've nearly finished watching now) – this was the last story to feature the cybermen until 1975 (7 years later)

Show thread

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 14:31

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 14:31

Oct 04, 2018, 14:31

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

@soft_chomps@glitch.social oh my gosh!!!

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 14:10

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 14:10

Oct 04, 2018, 14:10

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

@sina that lighting makes your face look amazing

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 14:05

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 14:05

Oct 04, 2018, 14:05

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

food question

@softgoat it depends on what fish it is!

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 14:04

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 14:04

Oct 04, 2018, 14:04

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

@scarlett ::D

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 13:36

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 13:36

Oct 04, 2018, 13:36

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

@BatElite oh my gosh

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 12:39

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 12:39

Oct 04, 2018, 12:39

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

sneerp

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:53

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:53

Oct 04, 2018, 07:53

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

git question, addressing everyone's responses

Unfortunately it's part of a build system, so I can't rename it - it has to be stack.yaml

I can't set it to work on both because I need these lines on my system:

nix:
enable: true

and those lines don't work without nixos.

I can't use the global gitignore because I have stack.yaml in other repositories that use stack, and I have to commit the file in those.

and the .git/info/exclude file doesn't seem to work

Show thread

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:49

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:49

Oct 04, 2018, 07:49

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

git question

@loki @catoutofbed@octodon.social I can't do that, because other projects NEED me to track the stack.yaml file

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:46

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:46

Oct 04, 2018, 07:46

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

git question

@loki @catoutofbed@octodon.social this does not appear to work:

363e12578fca7420.png

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:44

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:44

Oct 04, 2018, 07:44

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

re: git question

@rachel yeah, I find git gets in the way a lot more than it should

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:42

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:42

Oct 04, 2018, 07:42

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

git question

@CobaltVelvet@octodon.social I know, but I'm used to typing "git commit -a".

I can change my behaviour, but I'd like to have the computer prevent me from making the mistake in the first place, if possible

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:42

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:42

Oct 04, 2018, 07:42

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

git question

@loki @catoutofbed@octodon.social there's already a gitignore file, so if I modified it I'd now have to make sure not to send the change to the gitignore file upstream

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:41

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:41

Oct 04, 2018, 07:41

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

re: git question

@rachel the problem is I keep having to revert my branches because I accidentally type "git commit -a"

(because I'm used to a mercurial workflow)

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:39

**Lizardsquid, maker of noises** @lizardsquid@computerfairi.es · Oct 04, 2018, 07:39

Oct 04, 2018, 07:39

Lizardsquid, maker of noises @lizardsquid@computerfairi.es

git question

I'm working in a repository made by someone else, and it includes a build file.

This build file should NOT change upstream, however in order for it to build on my system I needed to make some OS-specific changes to the file.

Is there a way to tell git "hey, don't commit this file, and just leave it the way it is" without either removing my modifications to the file or sending my modifications upstream?