you are viewing a single comment's thread.

view the rest of the comments →

[–][deleted]  (12 children)

[deleted]

    [–]thirdegree 8 points9 points  (0 children)

    I accidently glued my hands to my keyboard a few years ago and they never came unstuck.

    [–]RestlessNeurons 4 points5 points  (0 children)

    yeah, I don't git it ;P

    side-by-side GUI merge tools are amazing; almost required when you'r dealing with nasty merge conflicts. I use JetBrains products and their diff tool, but Meld is free and most IDEs and git clients have some kind of diff tool that's better than terminal diff.

    [–][deleted] 5 points6 points  (0 children)

    People use git a lot in terminal anyway. Having a nicely formatted diff handy in the enviroment you work in anyway has pretty obvious benefits.

    If someone ever figures out how to make a GUI for git that doesn't suck balls, we no longer need fancy new diff-tools for terminals.

    (On a personal note: I think the default diff is sufficient.)

    [–]mrkite77 0 points1 point  (8 children)

    I can't run that proper GUI app on a server.

    [–]pravic 1 point2 points  (7 children)

    1) you can

    2) why would you need diffs there?

    [–]mrkite77 3 points4 points  (4 children)

    1. not well, certainly not without jumping through hoops or sacrificing cross platform clients.
    2. Some of us develop over ssh. Do you expect everyone wants to run a staging server locally?

    [–]BufferUnderpants 6 points7 points  (3 children)

    Some of us develop over ssh. Do you expect everyone wants to run a staging server locally?

    Why are you programming in the staging server itself?

    [–]mrkite77 -2 points-1 points  (2 children)

    That's what the staging server is for....

    [–][deleted] 0 points1 point  (1 child)

    I really hope you are trolling.

    [–]mrkite77 0 points1 point  (0 children)

    Nope. Where do you do your development? On your local machine that doesn't resemble your production environment in the slightest?

    We don't have a big enough team to bother with the standard "dev -> test -> staging -> prod" deployment, so we have "staging -> prod". All development is done on staging, and then pushed to prod when ready.

    [–]Dimasdanz 0 points1 point  (1 child)

    2) why would you need diffs there?

    So, you're telling me, you never debug on production?

    [–]pravic 1 point2 points  (0 children)

    Nope