I wouldn't say a git is silly, stupid, childish or incompetent...

Just someone who's pissed you off

you know, of all of the features in "We're not a Q&A site", the one I want the most is a custom sandbox

@NathanMerrill especially if it's mandatory ;)

I'm ok with it mandatory

I'd still prefer if there was a rep-privilege for it

@Sherlock9 git fetch upstream && git rebase upstream/branch_name -X ours

@NathanMerrill yes, I'd also like a privilege level for posting challenges

@Downgoat So if Mego's branch is "Mego/master" and mine says "master"

What in the hell am I doing?

oh, I was meaning a privilege level for skipping the sandbox. If we do make the sandbox mandatory, then I think that any user should be able to post there, regardless of rep

@Sherlock9 ?

@NathanMerrill oh okay, in that case I disagree with a privilege level for skipping the sandbox :P

I'm sorry. I'm quite tired and I don't quite know how to fill your suggestion in

LOL ... $null is obviously somewhere between -1 and 0 --

you'd still want a minimum rep level before it goes to the sandbox though?

PS C:\Tools\Scripts\golfing> $null -lt 0
True

PS C:\Tools\Scripts\golfing> $null -lt -1
False

git fetch upstream && git rebase upstream/master -X ours should work, and not throw any conflicts.

nice thing about git rebase over git merge is it correctly places the commits in history. Bad part is you gotta force push git push -f

Exactly like git fetch upstream && git rebase upstream/master -X ours

so a user dont lose gained privileges if the rep is lesser than the minimum rep of the privilege

Because that's not doing anything

Just git fetch upstream gives me Not a git repository

@Sherlock9 :/ odd. what does git remote -v output?

It should be noted that the Git Shell is just in D:\GitHub

D:\GitHub> git remote -v
fatal: Not a git repository (or any of the parent directories): .git

oh :| you should navigate to your project folder first

D:\GitHub\Seriously [master ≡]> git fetch upstream && git rebase upstream/master -X ours
At line:1 char:20
+ git fetch upstream && git rebase upstream/master -X ours
+                    ~~
The token '&&' is not a valid statement separator in this version.
    + CategoryInfo          : ParserError: (:) [], ParentContainsErrorRecordException
    + FullyQualifiedErrorId : InvalidEndOfLine
    D:\GitHub\Seriously [master ≡]> git fetch upstream
fatal: 'upstream' does not appear to be a git repository

Challenge upgraded :)

Hang on

Sorry for all the posts

git remote -v output?

@NathanMerrill I suppose with a mandatory sandbox a rep level for posting to it wouldn't be necessary

D:\GitHub\Seriously [master ≡]> git remote -v
Mego    github.com/Mego/Seriously.git (fetch)
Mego    github.com/Mego/Seriously.git (push)
origin  github.com/Sherlock9/Seriously.git (fetch)
origin  github.com/Sherlock9/Seriously.git (push)

oh

git fetch Mego
git rebase Mego/master -X ours

sequence identification time: I have no idea what this sequence means, and it's not on OEIS: 0,0,9,34,3853,31770,68719460581,4398046446026,18446744073708506933,472236648286‌​9636840554

usually it's called upstream :/

Does anyone know if Lolcode will auto cast truthy integers into TRUE and 0 into FALSE ?

or do I have to compare if its != 0 ?

@ConorO'Brien Where did you get that?

@thepiercingarrow it's from a bug in my code

@Downgoat You are a godsend. Thank you very, very much :D

:D np

@downgoat I will cook you into chevon >:(

> That escalated quickly.

@TimmyD yes, yes it did

@TimmyD lol, fuuny ;)

although its quite slow if you think about it

takes 5 numbers to go to 3 digits

@MartinEnder can you delete the answer on this questions: codegolf.stackexchange.com/questions/87444/diff-compression

@thepiercingarrow if this is an attempt to be funny i fail to see it, it just seems to be a rude remark

@Downgoat NO I AM MAD AT YOU

its invalid, and it keeps my question from appearing on the unanswered list

why?

@thepiercingarrow why D:

@Downgoat YOU NO RESPOND TO ME FOR A MONTH

??

I GIVE YOU COMPILE ERRORS YOU NO READ THEM!!

um sry

Im doing too much LOLCODE, getz me into bad typing habitz

REMEMBERZ?

@thepiercingarrow ??

@Downgoat O RLY?

gaot is confused

Gaot is not the only one

@ConorO'Brien Maybe it's the sequence.

xD

^^^

OMG fuck brew

Im gonna write my own osx package manager

@ConorO'Brien 0 = 0 + 9 = 9 × {3, 7/9} = 34

@thepiercingarrow call it cheddar-lang/Cheesecloth :D

XD

@Downgoat I'm now getting things like

=======
<<<<<<< HEAD
and
>>>>>>> refs/remotes/Mego/master
>>>>>>> origin/master

@Downgoat according to some place, I heard swift is the fastest growing language.

@zyabin101 what does this even mean

@Downgoat but im like 99% sure that Cheddar grows faster

What in the heck is going on now?

@ConorO'Brien HE IZ LOOKING FUR EQASON

@Sherlock9 uh oh. that means -X ours didn't work. you've got a conflict >_> what was outputted after you ran the git rebase command?

@Sherlock9 Merge conflict. Abort the merge and "fix it now now now now now fixed it now!" (with apologies to Quill)

@thepiercingarrow obviously, but 0 != 9 != 34

God save me

Alright

DIS IZ NOT EQUASON DIS IZ ILOGIC B***NFUCK

Gentlemen

I have no idea how to fix the merge

@Sherlock9 okay alternatively you may try git rebase --abort to stop the rebase and then git merge Mego/master -X ours

D:\GitHub\Seriously [master ≡]> git rebase Mego/master -X ours
warning: refname 'Mego/master' is ambiguous.
warning: refname 'Mego/master' is ambiguous.
First, rewinding head to replay your work on top of it...
Already applied: 0001 Extensive additions to numeric docs
      1 [main] sh (14308) C:\Users\Student2014\AppData\Local\GitHub\PortableGit_624c8416ee51e205b3f892d1d904e06e6f3c57c8
\usr\bin\sh.exe: *** fatal error - cygheap base mismatch detected - 0x61313400/0x11A3400.
This problem is probably due to using incompatible versions of the cygwin DLL.

@ConorO'Brien 0 = 0; 0 + 9 = 9; 9 × {3, 7/9} = 34

> fatal error

@zyabin101 what does {...} mean here?

uh oh

I think git got borked

:| Im sorry but i have no idea what that means. Either sh or git crashed

Oh dear god

@ConorO'Brien {...} in the context of {3, 7/9} is a fraction 3 + 7/9.

@zyabin101 ah.

@Sherlock9 try the git merge approach

git rebase goes crazy when changes have diverged. It's usually good for keeping origin/local branches in sync

D:\GitHub\Seriously [master ↕]> git merge
fatal: You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you merge.

I thought I committed that already

Good gravy

do a git status

D:\GitHub\Seriously [master ↕]> git status
On branch master
Your branch and 'origin/master' have diverged,
and have 4 and 2 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

oh just do git add -A and then git commit

then you should be good

I should write a blog article on fixing common git problems

git drop everything delete full

How about I don't do that one

Downgoat I owe you big time :D

Thank you very very much. My repository lives again

@Sherlock9 \o/ i was helpful :D

@Mego When you have the time, can you take a look at this version of numeric.rst github.com/Sherlock9/Seriously/blob/master/docs/numeric.rst? If I got all the numeric commands, I'll remove all the TBCs and make a pull request

@Downgoat Indeed. In my exhaustion, I forget what goats eat, but I owe you a full month's worth of that, my friend :D

out diet is composed of 99% tin cans and 1% tin can flavored hay

TIL goats eat tin cans

So what do all of push, merge, commit, add -A, remote -v, fetch, and rebase do? I gather that status gets the status of the repo, but everything else has some nuance that escapes me

goodbye

@Sherlock9 git is pretty complicated

but you can quickly get a workflow

git add marks files to be added (staged) in the next commit

git add -A automatically adds all files to the next commit

git commit -m "yay a message" actually commits the files you previously marked

for example let's say you edit main.py and somelib.py to implement colors in your app

git add main.py somelib.py

git commit -m "Added colors."

right now your changes are added into your local repository's history

as a commit

@Sherlock9 push pushes the local commits to the remote. merge gathers the diff between two branches and compiles them together to combine into a single branch. add -A stages all files (including untracked ones). remote -v lists the remote(s), with verbose-ly. fetch downloads the remote repo but doesn't merge. rebase is the most complicated, similar in use to merge, it instead places the commits to how they happened, though this doesn't handle conflicts well

you should see a commit as an atomic change in the history of a program

git push allows you to then publish your version of history to a remote repository (such as github)

until you work in bigger organizations you should be able to get by using just git add, commit, pull and push

pull gathers everyone's commits? Or am I misunderstanding the push/pull idea?

@Sherlock9 pull is the opposite of push

it allows you to grab another repository's history and add it to yours

IIRC it's fetch (which only grabs the history) plus merge (which combines their history with yours) in one command

to be fair, I've used git for years and I don't really understand it

I just generally repeat what worked in the past

some day I'll take a course in it or something... when I find a job in a bigger organization where it's required

so the local repository is just for storing copies of stuff you're working on, until it is ready for a major update?

(and you dont actually manipulate it in any other way than via git?)

@flawr well, that could be one workflow

git is decentralized

you can choose your one model

Thanks for the quick tutorial @orlp @Downgoat :D I should bookmark this whole conversation

most people have one big 'master' repo on a public (or private) place that every pulls/pushes to/from

often people also use branches (an important feature I haven't touched upon here yet) to not conflict work in progress

branches allows you to have multiple histories side-by-side and merge between them

so often there's a 'stable' branch for the workign version of the app

then a 'dev' branch for work-in-progress

and if your organization becomes larger you start adding branches for individual features

e.g. you want to add gif support to your simple browser

you make a new branch named 'gif', and implement the feature there

then once the feature is done you can merge that work into the development branch

this is a popular article i reccomend reading: nvie.com/posts/a-successful-git-branching-model

and then when the development branch is ready you merge it into the stable branch

So how does merge know what to do?

but if you're an organization for 1-3 people

I wouldn't really suggest using branches unless you already know what they do

@flawr it doesn't, generally

What happens if it doesn't know what to do?

^^ that's why you use -X ours or -X theirs

it makes safe 'guesses', but if it can't figure it out it'll ask you solve a merge conflict

ah ok

most of the time there is no conflict though

only if you try to merge two versions of history that have edits in the same place in the same file

one more question: I guess can also remove files again? Can you also remove files from your project without deleting the actual file on your computer?

@flawr yes, but obviously read up very well before using those commands

@flawr you mean un tracking it? git rm --cached myfile.txt

better idea is to add to gitignore though because many people just do git add . which will add it anyway

so the gitignore is just a file that lists what git should ignore?

@flawr yeah

I think I slowly get it, and I'm gonna give it another try.

So the idea is whatever you do to the files in terms of renaming/moving, you'll just do it via git, such that it can registar what you actually did, and at some point update the repositories accordingly?

hello, world

@aditsu hello part of the world

I’m struggling to write Retina code. ;_;

whoever guesses what country I'm in wins a cookie

@Lynn Try MATL instead=)

@aditsu Liechtenstein?

nope

I have a bunch of newline-separated matches, and I want to join them all together.

@aditsu Monaco?

The docs contain no examples of an actual Replace stage…

I just wanna s/¶// I guess??

@Lynn write retina code!

@flawr nope, it's not that rare

@aditsu Luxembourg!

Andorra?

Vatican City?

Et I'll help :3

Give us a hint!

@flawr 3 strikes, you're out :p

anyway, your first guess was not too far

@Lynn: Basically you want to remove newlines from some text?

@Lynn, @BusinessCat nope

Yep.

Switzerland?

Austria?

nah

Hungary?

San Marino!

This works

Slovenia?

you must be really Hung'ry for a cookie :p

Germany?

@BusinessCat retina.tryitonline.net/…

Poland?

@flawr finally, but you had too many tries

you get.. an internet cookie

=) internetomnomnom

Hmm

I should start a service where you can send actual cookies!

@aditsu United States, Canada, Mexico, Panama, Haiti, Jamaica, Peru ...

@flawr Set-Cookie: sessionID=6865792062616279; Expires=Sat, 13 Aug 2016 19:14:00 GMT

@aditsu =)

anyway, I'm just killing time at the airport

Where are you heading?

back to HK

I've been to Romania for about 10 days

I actually thought aditsu was German. @_@

Oh cool!

@quartatas sent trade offer, couldn't yesterday because i was out of town.

@Lynn since when?

I dunno. I must have mixed you up with someone else here. ^^;

has everybody been good while I was away?

hmm, I see git talk, tsk tsk

@Lynn: Don't ask me why this works

Retina is confusing

J SO Doc proposal

Hm, I don't know why but I think I've done something wrong... ;)

What did you do

he changed his name to use Greek letters :O

@βετѧΛєҫαγ What are you working on?

I was supposed to blur it, not turned it blue

@βετѧΛєҫαγ Only one letter out... ;)

yeah, they're like next to each other

@flawr ^

I'm creating the examples

@βετѧΛєҫαγ Blur, Blue ... Levenshtein distance of 1. Close enough.

Oh. Ninjango'd while I was looking up the proper spelling of "Levenshtein"

That's annoying... American Gothic took ages to run :P

Well it's better... ish

Secret of the ninja: use small words

@βετѧΛєҫαγ you're not dividing properly?

@orlp Possibly...

That's better

I needed to square the denominator

Doesn't look very blurred though

If you zoom in it is.

@TimmyD Scotland, England, Ireland but not Wales...

You'd need to run the program multiple times to get full blur

@βετѧΛєҫαγ you can't get appropriate blur size by repeating the same small blur kernel, can you?

Blur kernel?

you should look up kernels

Ohh

convolution

Alright, I think I've got a working formula that does'nt affect the brightness

@βετѧΛєҫαγ I don't get what to do in your challenge

@flawr You take an image as input and follow the formula for each pixel to average the colour

@orlp oo thanks for showing me this channel

@ConorO'Brien You didn't know computerhpile?????

no, I don't watch youtube

only when someone links me to it

@ConorO'Brien You should start to do so.

@flawr why?

It is an excellent ressource for wasting time.

And there are so many great channels to waste your time on!

@ConorO'Brien all right

you want to start

by watching every video made by brady haran's channels

but I already waste all my time here

that is: computerphile, numberphile, sixty symbols, periodic videos

@ConorO'Brien You can do better, I believe in you.

@trichoplax That's not the only mistake -- scroll down to Trivia

I do watch numberphile

Veritasium

Vsauce

CGP Grey

@orlp objectivity and deep sky videos

I think brady's videos are universally great

veritasium is often... too dumbed down? I don't know

vsauce can be great, but can also be too... random

brain craft!

cgp's are usually great

then there's kurzgesagt

It's Okay to be Smart

smarter every day

veritasium is becoming more and more philosophical

@NathanMerrill This is true

for me smarter every day falls a bit under the same umbrella as veritasium

veritasium and smarter every day IMO just take 10 minutes to say something that 30 seconds could do

or end up with a philosophical conclusion that left you none the wiser

mathias wandel, and frank howarth <- both genious woodworkers but with totally different approaches, check them out even if you you have no idea of woodworking

smarter every day has more "experiments", which I like

like, the entire "what happens to your brain with no oxygen"

Yeah I like that too, but I agree that their videos are sometimes rather lengthy

reddit.com/r/artisanvideos is also (sometimes) good

I mean, I would have shortened that clip, but it really hit me when he was struggling to understand that he needed to put his mask on

@NathanMerrill but that's the thing

you could've shortened that video to those 30 seconds

and nothing of value would be lost

the brain scoop

I think 30s is a bit too low, but I agree

@NathanMerrill for that particular video, sure

but often for his 'slow motion' videos really you could've had a 30-60 second video