|
Apr
15 |
|
awarded | Popular Question |
|
Mar
26 |
|
awarded | Organizer |
|
Mar
9 |
|
awarded | Caucus |
|
Mar
4 |
|
awarded | Yearling |
|
Mar
1 |
|
answered | Linux kernel (and other system programs): Is it possible to configure/tweak them for optimal performance, with maximum hardware utilization? |
|
Mar
1 |
|
comment |
With git, how do I remove a local copy of a remote branch? Or at least pull without merging? Why would you update the master branch? (did you mean: git fetch?)
|
|
Feb
21 |
|
comment |
Microformatting accepted, then ignored Did you happen to switch to XHTML for your website? |
|
Feb
21 |
|
revised |
python syntax while using dict retagging |
|
Feb
21 |
|
comment |
Undoing a Bad Merge @DietrichEpp Thanks for making that clear, it was not obvious to me. I'll just move on. I only wanted to try to give constructive feedback. |
|
Feb
21 |
|
comment |
Undoing a Bad Merge @DietrichEpp Thats clear to me. The problem I just see for someone not knowing it's repository by heart is, which was the exact commit which was on masters HEAD before the ff merge? |
|
Feb
21 |
|
comment |
Undoing a Bad Merge Hmm. I'm not sure about that, but I'll better believe you before I had my first coffee ;) |
|
Feb
21 |
|
comment |
Undoing a Bad Merge Aaah, nevermind, I got it now. If you now add git reflog or something else useful as a hint on how to find the old masters HEAD, you get a +1 :)
|
|
Feb
21 |
|
comment |
Undoing a Bad Merge There is no merge commit for the first merge, so no parents. |
|
Feb
21 |
|
comment |
Undoing a Bad Merge Until you get an answer, I can add two more things: first, git reflog might be of help here, second, whatever you do, if you undo and redo the merge with a non-ff merge, you'll end up having a non-fast-forward push, meaning you have to force-push to github. This is generally a bad thing, because it will cause serious trouble for all people who have pulled the repository in the meantime.
|
|
Feb
21 |
|
comment |
Undoing a Bad Merge I can at least tell you that what happened was that the first branch was a fast-forward-merge, and this is not a bad thing to happen at all. If you really need to keep the history, in the future, you have to call merge with the --no-ff option.
|
|
Feb
21 |
|
revised |
error: ‘hour’ was not declared in this scope added 19 characters in body |
|
Feb
20 |
|
comment |
error: ‘hour’ was not declared in this scope @JohnZwinck Thanks for the suggestion, I added it to the answer. |
|
Feb
20 |
|
answered | error: ‘hour’ was not declared in this scope |
|
Feb
20 |
|
comment |
Are my Greasemonkey scripts visible outside my PC? Are you console.log-ging the user and password in plain there? |
|
Feb
19 |
|
comment |
Difficulties to measure C/C++ performance @DanielFischer Agreed on -O3, something must be different in there, getting a factor of x4.
|
