Tavern on the Meta

Final Contest

8:07 PM

@BenjaminGruenbaum: I am not Laszlo. Bart tries to match all the characters with one account that he does not like.

:D

@VotetoClose: what you are saying is basically that quantity matters for you over quality.

user163250

Speaking of downvotes, would it be wrong if I linked to a duplicate answer that could use a few? Here in chat, I mean.

Final Contest

@BenjaminGruenbaum: well, the whole "do not delete utterly incorrect and nonsense" answers is also hurtful. I have never understood why people intentionally leave crap around.

Bart

@FinalContest chat.meta.stackexchange.com/transcript/message/1513419#1513419 ... I rest my case. ;)

Braiam

@Cupcake I downvote any post pasted here if I think they deserve a downvote

user163250

well in that case...
http://stackoverflow.com/questions/2389361/how-do-i-undo-an-accidental-git-merge-that-hasnt-been-pushed-to-the-remote/19831261#19831261
Exact duplicate of this earlier answer,
http://stackoverflow.com/questions/2389361/how-do-i-undo-an-accidental-git-merge-that-hasnt-been-pushed-to-the-remote/5343267#5343267

Vote to Close

8:11 PM

@FinalContest Chances are if you take an hour walk every day, some days you will unfortunately step in some animals crap.

user163250

Also foolishly upvoted...way too much.

Final Contest

@Cupcake: I do not get it.

it is a tad simple answer correct both ways. Why would you downvote either instance?

user163250

It's an exact duplicate answer.

user163250

Here's the first...

user163250

> Assuming your local master was not ahead of origin/master, you should be able to do
>
> git reset --hard origin/master
>
> Then your local `master` branch should look identical to `origin/master`.

user163250

8:12 PM

Here's the later one...

user163250

> The following worked fine to undo the merge.
>
> git reset --hard origin/master

user163250

See what I mean.

user163250

It's not about the answer being simple.

user163250

It's about the answer being a duplicate of an existing answer.

Final Contest

it is not an exact duplicate, i.e. copy/paste, but would you like to get the answer with 798 downvoted, too, since it is part of the accepted answer?

user163250

8:13 PM

You have a very strict definition of "duplicate".

Final Contest

well, I spread some upvotes in that thread...

user163250

Nowhere does the accepted answer say:

git reset --hard origin/master

Final Contest

True. But this is usefull to know as well — Alex Semeniuk Mar 1 '13 at 15:12

LOL -> I mean facepalm.

user163250

Now your definition of "duplicate" is too broad.

user163250

Pick one or the other, don't be inconsistent.

Final Contest

8:15 PM

I am picking up even if you want to make me look like picking, too.

Braiam

I see what @Cupcake means, the later answer is exactly the same with years apart the good answer

Final Contest

you want to downvote a correct answer because it is very similar to the other. I asked an honest question: would you also downvote the one with 798 upvotes because the accepted answer mentions that (not 1:1 copy of course)?

Braiam

they are essentially the same

user163250

@Braiam that's what I would argue.

Braiam

/me flags for deletion

Final Contest

8:16 PM

lemme dismiss that flag in the queue ;)

user163250

Final, you have the most inconsistent application of "duplicate" that I have seen yet.

2

user163250

Oh well, I'm not going to argue about it anymore.

Final Contest

I have no idea what you are talking about, honestly.

either way, it is pretty surprising to flag answers for removal that are 1) Correct 2) Upvoted and leave crappy and awfully incorrect answers around.

Braiam

@FinalContest he's saying that there are two answers which are essentially the same within the same question with years apart each other

Final Contest

so what?

Braiam

8:20 PM

what if I start to answer the same questions you have answered using the same logic that you show in your answers?

hichris123

@FinalContest Incorrect answers should not be flagged/deleted. They should be downvoted.

Final Contest

@Braiam: go ahead.

@Braiam: bear in mind, you may or may not get downvoted/upvoted to oblivion.

Bart

Haha, come on @FinalContest. You've cried foul before and demanded attribution when you thought that happened to you.

Final Contest

@Bart: have you read the thread?

What to attribute here? That is one tad basic git command.

in fact, if one carefully reads the thread, it is clear that many answers duplicate/overlap each other.

Braiam

well, the thing is that the answer doesn't add anything to the per-exising answers, and shall be thrown in the burninator

Final Contest

8:23 PM

@Braiam: will you also flag the answer with 798 upvotes for deletion?

It reiterates this answer with one year difference:

0

A: How do I undo an accidental Git merge that hasn't been pushed to the remote?

You can use the git-reset command. git-reset - Reset current HEAD to the specified state. git reset [--mixed | --soft | --hard | --merge] [-q] [] git reset [-q] [] [--] … git reset --patch [] [--] […] GIT-Reset

Please read the thread carefully before randomly flagging correct answers for deletion.

user163250

The answers I pointed out are both extremely simple. As a consequence, it is rather trivial to see the the latter one copies the earlier one, while adding no additional information of any value.

Final Contest

@Cupcake: eh? Where is your "be nice" intent and good faith?

in fact, some people read the questions only and answer accordingly. Nothing unusual there.

I do not see why a git reset --hard HEAD alike stuff would need any copying.

almost any git user is aware of it, come on.

do you really think one cannot answer that from own resources?

user163250

I don't get what "intent" has anything to do with this. Someone left a duplicate answer, it should be downvoted (and even better, removed, if possible), regardless of the intent of the author.

Final Contest

"As a consequence, it is rather trivial to see the the latter one copies the earlier one"

I do not see any evidence for copy-paste there.

user163250

I give up.

Braiam

8:26 PM

nobody (read: me) is saying OP did what he did in bad faith... just that it doesn't add more information to the answers and I seriously don't like users regurgitating, vomiting and spitting the same answers

noise to signal ratio is bad if that's allowed

Final Contest

@Braiam: then flag the answer with 799 scores for removal, too.

it is repeating the answer with zero score one year later.

user163250

This answer that you keep pointing to:

user163250

0

A: How do I undo an accidental Git merge that hasn't been pushed to the remote?

You can use the git-reset command. git-reset - Reset current HEAD to the specified state. git reset [--mixed | --soft | --hard | --merge] [-q] [] git reset [-q] [] [--] … git reset --patch [] [--] […] GIT-Reset

Final Contest

As I said before, if one carefully reads the thread, it can be realized in no time, the whole thread is full of duplicatism at best and overlap.

user163250

Is a crap answer that doesn't explain anything.

Braiam

8:28 PM

@FinalContest I flagged for deletion that because it doesn't explain anything, it just regurgitate the manual

Final Contest

LOL

facepalm

@Cupcake: btw, IMHO you made the title worse, but I will not go into an edit war.

hichris123

@FinalContest facepalm

Final Contest

It is now too lengthy and noisy. The original title was concise and to the point.

Braiam

man, I love conjugating regurgitate... makes me sound so intellectually advanced

Final Contest

I am not sure if the bolding gave any value either.

Braiam

8:33 PM

btw @Cupcake, the @Undo tag?

Final Contest

@Cupcake: do you mind if I revert the title?

Braiam

only @Undo can answer question tagged with Undo

Final Contest

even the accidental is incorrect in there in the sense it is not about an accidental revert, but a git merge revert. The question and answers would be same without "accidental".

"Undo local git merge" maybe.

@rene: where are the dutch goals?!

rene

It is quiet out-side so I assume no score yet. I heard someone swearing though...

You notice I'm a big fan...

hichris123

cv-plz stackoverflow.com/questions/24590064/…

Final Contest

8:40 PM

@Bart: haha, I got another downvote on the most upvoted answer of mine. It is needless to say it is unexplained, it is the default.

@hichris123: not only close vote, but also down vote.

hichris123

@FinalContest Yeah. I was surprised: I was the only downvoter so far. With 2 other close votes.

Final Contest

well, I will not close vote it.

hichris123

why?

Final Contest

but if I could, I would write something along these lines: "It is off-topic because it is about magician skills whether we can reverse engineer the OP's code from the air".

Bart

"It is off-topic because ... " ... "I will not close vote it" <-- what?

Braiam

8:45 PM

why people use filezilla so much when they have rsync which is more reliable

@Bart he spent all his votes..?

Final Contest

@Bart: what what?

Bart

Are you out of votes?

Final Contest

well, it does not take you much to read 50 crappy questions a day, does it?

@rene knows the best :D

user163250

Regarding the title...

user163250

I'm not interested in belaboring the issue, but...

user163250

8:49 PM

There is a very good reason why I edited the question and title to be like that.

hichris123

SPAM: stackoverflow.com/questions/24590425/mr-sergio-melnicenko

user163250

Tell me, what do you think the original poster's problem was?

Final Contest

undo git merge

Braiam

@FinalContest that's a poor way to describe the problem

user163250

What kind of git merge?

Final Contest

8:51 PM

any, which is not pushed.

user163250

Tell me, what did the original poster do to try to solve his problem?

Final Contest

see above

user163250

Not quite any.

user163250

Accidental.

Final Contest

no

user163250

8:51 PM

He doesn't want it.

Final Contest

it would be the same for non-accidental, too.

Bart

So remove accidental

user163250

Also, what did he already try to do?

Final Contest

if I want to revert an intentional merge.

user163250

I have a point that I'm getting to with all of this.

user163250

8:52 PM

But you're not following along.

Bart

Get to it

:)

Final Contest

@Bart: accidental + all the fluffy noise added, yes.

Braiam

@FinalContest to revert changes in git there are some specific nuances:
- what you want to revert
- if you have pulled/pushed it

user163250

Ok, here goes.

Bart

No @FinalContest. If you yourself say "which is not pushed" ... that should be part of the title.

user163250

8:53 PM

The merge was accidental (the poster doesn't actually want it). He tried this to solve it:

Braiam

yeah, accidental is an extra

Final Contest

@Bart: I think you are selectively ignoring me.

user163250

git revert HEAD -m 1

Bart

Absolutely @FinalContest. Keeps me sane.

Final Contest

"even the accidental is incorrect in there in the sense it is not about an accidental revert, but a git merge revert. The question and answers would be same without "accidental".
"Undo local git merge" maybe."

Braiam

8:53 PM

@Cupcake I can't accidentally merge two branches

user163250

Now look at this answer...

user163250

516

A: How do I undo an accidental Git merge that hasn't been pushed to the remote?

See chapter 4 in the git book and the original post by Linus Torvalds. To undo a merge that was already pushed: git revert -m 1 commit_hash Be sure to revert the revert if you're committing the branch again, like Linus said.

Braiam

I have to type too many damn hard words to make something accidentaly

user163250

>To undo a merge that was already pushed:
>
> git revert -m 1 commit_hash
> Be sure to revert the revert if you're committing the branch again, like Linus said.

user163250

That answer doesn't actually solve the original problem.

user163250

8:55 PM

It probably would have been more appropriate as a comment.

user163250

But whatever.

user163250

I don't actually care that much.

Final Contest

See what Justin wrote in 2011.

so, are you happy with my proposal without the ping-pong game?

""Undo local git merge" maybe.""

hichris123

cv-plz stackoverflow.com/q/24008953/2581872

Braiam

> Undo a branch merging that hasn't been pushed to the remote repository?

there, perfect title

Final Contest

8:57 PM

way too fluffily noisy.

Braiam

@FinalContest it captures the essence of the problem unambiguously

Final Contest

I am sure it does, with a lot of noise in it.

user163250

Why do you guys want to get rid of accidental?

Final Contest

I prefer concise and to the point stuff.

user163250

The merge commit isn't needed.

user163250

8:59 PM

You can just throw it away.

user163250

Trying to revert it means you keep it.

Braiam

@Cupcake because I had the same problem, it wasn't an accident, but shortsight

you can't accidentally start typing on the keyboard...

user163250

Ok, I can kind of see where you guys are going with this.

user163250

I'm not sure I agree.

user163250

Whatever, I don't care anymore.

Bart

9:01 PM

Yes you do. ;) But it might not be worth this much discussion.

Final Contest

In fact, IMHO git should go to superuser unless it is about programming git itself.

Bart

Nah

Final Contest

it is basically generic software use and hence a generic software question, not programming code.

user163250

By the way, by "I don't care anymore", I mean go ahead and rollback if you want, I don't care anymore.

Final Contest

you could use git for maintaining your artistic logos, too.

Bart

9:03 PM

It falls under "software tools commonly used by programmers" and as such is on-topic.

hichris123

^

Final Contest

@Bart: a pornwatcher is also on-topic then.

it is commonly used by programmers.

Bart

/facepalm

Final Contest

exactly my point!

Bart

By all means go argue your point on Meta of vote to close accordingly.

Final Contest

9:06 PM

you should by now know inside and out I do not participate to crapeta with answers and questions, at least.

user163250

@Bart I can't star your facepalm, I'm out of stars :/

Braiam

@Cupcake start plastering cupcakes?

meh, I liked my title...

Bart

@FinalContest absolutely. It was my attempt at avoiding any further discussion on that bit of nonsensical drivel.

hichris123

cv-plz stackoverflow.com/q/1719914/2581872

user163250

860

Q: Undo local git merge

Within my master branch, I did a git merge some-other-branch locally, but never pushed the changes to origin master. I didn't mean to merge, so I'd like to undo it. When doing a git status after my merge, I was getting this message: # On branch master # Your branch is ahead of 'origin/master...

git

user163250

9:10 PM

That's a terrible title.

Final Contest

@hichris123: hope you downvoted some crappy answers there, too

2

A: Resources for UnrealScript

The mailing lists are also very useful, they can be found in udn.epicgames.com

0

A: Resources for UnrealScript

There are some tutorials on this website.

user163250

Merges can only ever be local.

Bart

@Cupcake geez ....

Final Contest

except that when you push the merge.

user163250

"Undo local merge commit" makes more sense, but even that is not as good as explicitly saying that the commit hasn't been pushed yet.

Final Contest

9:11 PM

that does not make sense since it drops the single most important part of the title: git.

Bart

cough tag cough

hichris123

Also this one: cv-plz stackoverflow.com/questions/3821800/…

user163250

"Undo a Git merge that hasn't been pushed to the remote?"

user163250

Can we agree to that?

Final Contest

Nope.

We already went through that.

user163250

9:13 PM

Or if you really want it shorter...

Final Contest

I am actually not sure what you are trying to achieve.

user163250

"Undo a Git merge that hasn't been pushed?"

Final Contest

"has not pushed to the remote" -> local

Bart

Note to self: players run in opposite direction in second half. That was an offensive attempt, not a near goal against.

Final Contest

IMHO, you are trying to resolve a non-existent problem.

user163250

9:14 PM

The original title was too vague.

user163250

You haven't really improved it that much.

Final Contest

too vague is exaggeration, but that is why I proposed one word fixing it.

I do not understand why we are still discussing it. I think you just prefer your way of forming the sentence rather than fixing the objectivity about it.

user163250

Look, I spend a lot of my time trying to improve the Git content on Stack Overflow.

Final Contest

the title was made concise, like it or not, so fix it in that mood rather than rewriting it to be longer than needed.

but if you want, flag it for moderator attention by any means. I am sure they are bored :D

and they will pick up the right title.

rene

@Bart you're more into Korfbal? Easier to follow...

Bart

9:17 PM

Nah @rene. I prefer sports

rene

:)

Final Contest

well, Holland is at least not a clear winner the last couple of matches.

@hichris123: I am surprised why other people here do not help with the close vote though :)

Looks like a clear case.

but this demonstrates well why it is useful to flag answers, too.

they are already almost removed.

even if the question stays untouched.

rene

@FinalContest Hey, watch it. You're still talking about the upcoming world champions.

Final Contest

@rene: it is nil-nil

rene

My statement is still true...

That is logic...

Bart

9:24 PM

And given that you didn't specify a tournament ...

rene

:)

Final Contest

well, drugs are legal there so they can get it for the football to be better :p

Bart

Except that they aren't legal, but let's get not into that whole deal ...

Final Contest

"Drug Policy

The drug policy in the Netherlands aims: to reduce the demand for drugs, the supply of drugs and the risks to drug users, their immediate surroundings and society.

The Dutch recognize that it is impossible to prevent people from using drugs altogether. Coffee shops are therefore allowed to sell small amounts of soft drugs."

from the national website: holland.com/us/tourism/article/dutch-drug-policy.htm

Bart

@rene will you explain "gedoogbeleid"? ;)

Vote to Close

9:31 PM

@Bart He can google gedoogbeleid - en.wikipedia.org/wiki/Drug_policy_of_the_Netherlands

"This is because the Dutch Ministry of Justice applies a gedoogbeleid (tolerance policy) with regard to the category "soft drugs": an official set of guidelines telling public prosecutors under which circumstances offenders should not be prosecuted."

Braiam

@Cupcake what I'm not sure is why are you both trying to keep that weird "git merge" thingy... sounds awkward and a attempt to make it sound like git-merge... heck, git-merge merge branchs, so the correct title is "revert/undo a branch merging"

rene

@FinalContest It is very simply. You can legally buy soft-drugs in a coffee shop. However the manufactoring of the soft-drugs is not allowed. The only thing the law-enforcement has to do is wait at the back-door of the coffeshop when new stock is delivered.

Braiam

@rene they are so clever, huh!

Bart

@Braiam it's one of those things where if you want to explain how it all makes great sense, you figure out you can't. Yet it somehow seems to work reasonably well. Until a French tourist again figures out all the stuff is far more pure and stronger than he is used to and jumps off his hotel balcony

rene

@Braiam Friends of mine lived in an appratment building at the 11th floor. The rent was based on your floor number (better views, higher rent). One day a large water spill came down. Turned out there was a grow-shop on the 20-th floor... that complete appartment was turned into a glass house for the weed plants. Indicates the profits...

Vote to Close

9:49 PM

@Bart In the US, it's pretty rare to see hotels with balcony's. Too big of a risk at being sued over someone else's bad decisions/mistakes.

random

Since git merge is the command they used, having it in the title wouldn't hurt "Undo or revert a Git branch merge" gets more related words in. The panic/mention about having pushed to remote should only come on the other version, where they have pushed.

Final Contest

@rene: extra time ...

@rene: yes, that is what I pasted, too ...

Stijn

10:06 PM

@FinalContest Both teams played a mediocre game at best I think, Argentina was just slightly better. Not an interesting game unfortunately.

Benjamin Gruenbaum

10:28 PM

@FinalContest lol

Why'd you change nicks anyway?

Final Contest

@rene: penalties ...

@Stijn: yeah, this wc sucks IMHO

bad matches except a few cases.

3ventic

Someone forgot to sanitize user input (NSFW)

hichris123

cv-plz stackoverflow.com/q/383584/2581872

Final Contest

10:47 PM

Holland is in the semi-final!

Note to "joshjdevl": writing "u" instead of "you" saves you a whole two characters, but makes you look like an idiot. — Paul Tomblin Dec 20 '08 at 18:45

+++++1000000

Braiam

@FinalContest just read the revision comment ;)

Final Contest

lol

user163250

Here's a hypothetical scenario. A user asks a question on Stack Overflow explicitly about writing a virus to infect self-driving cars, or pace-makers, or air traffic controller and airplane computers, or other critical digital devices. Other users help the OP to write the virus, which goes on to injure or kill a few people, maybe even hundreds or thousands. Does that make the other Stack Overflow users accomplices to the crime, legally? — Cupcake 3 mins ago

user163250

Or a less extreme example. Again, a user asks a question on Stack Overflow explicitly about creating a virus to steal credit card numbers from personal and corporate computers. Other users help the OP to write the virus. After using the virus to steal hundreds of thousands of credit card numbers, the OP sells them on the black market, or uses them personally. Again, does that make the Stack Overflow users who helped the OP accomplices in a crime? — Cupcake 58 secs ago

Braiam

@Cupcake both cases the OP doesn't show any code/effort from its part: too broad

Final Contest

10:54 PM

@Braiam: well, I hate those "r u k" indians and non-indians, too, but they do it the most for some reason.

y u h8 dem so much? nt vry nice of u. R u k?

user163250

11:48 PM

The question you linked is a canonical question. It is a question that is asked repeatedly on Stack Overflow by people who don't do prior research. The answer is always the same, which is why we wrote the canonical question. — Robert Harvey ♦ yesterday

user163250

/facepalm

Transcript for