Skip to content
  • Categories
  • Recent
  • Tags
  • Popular
  • World
  • Users
  • Groups
Skins
  • Light
  • Cerulean
  • Cosmo
  • Flatly
  • Journal
  • Litera
  • Lumen
  • Lux
  • Materia
  • Minty
  • Morph
  • Pulse
  • Sandstone
  • Simplex
  • Sketchy
  • Spacelab
  • United
  • Yeti
  • Zephyr
  • Dark
  • Cyborg
  • Darkly
  • Quartz
  • Slate
  • Solar
  • Superhero
  • Vapor

  • Default (No Skin)
  • No Skin
Collapse
Code Project
  1. Home
  2. Other Discussions
  3. The Insider News
  4. Git is simply too hard

Git is simply too hard

Scheduled Pinned Locked Moved The Insider News
comcollaboration
9 Posts 5 Posters 0 Views 1 Watching
  • Oldest to Newest
  • Newest to Oldest
  • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • K Offline
    K Offline
    Kent Sharkey
    wrote on last edited by
    #1

    Changelog[^]:

    Whatever comes next should be closer to how humans think

    "git reset --hard HEAD" is your friend

    Or at least mine

    D T M 3 Replies Last reply
    0
    • K Kent Sharkey

      Changelog[^]:

      Whatever comes next should be closer to how humans think

      "git reset --hard HEAD" is your friend

      Or at least mine

      D Offline
      D Offline
      Dominic Burford
      wrote on last edited by
      #2

      I totally agree with this. Having spent many years using other version control systems, I've found Git the hardest to get to grips with. Conceptually it's quite simple, but at the detailed level it's insidiously difficult.

      "There are two ways of constructing a software design: One way is to make it so simple that there are obviously no deficiencies, and the other way is to make it so complicated that there are no obvious deficiencies. The first method is far more difficult." - C.A.R. Hoare Home | LinkedIn | Google+ | Twitter

      K 1 Reply Last reply
      0
      • D Dominic Burford

        I totally agree with this. Having spent many years using other version control systems, I've found Git the hardest to get to grips with. Conceptually it's quite simple, but at the detailed level it's insidiously difficult.

        "There are two ways of constructing a software design: One way is to make it so simple that there are obviously no deficiencies, and the other way is to make it so complicated that there are no obvious deficiencies. The first method is far more difficult." - C.A.R. Hoare Home | LinkedIn | Google+ | Twitter

        K Offline
        K Offline
        Kent Sharkey
        wrote on last edited by
        #3

        Agreed, and when stuff goes even slightly wrong, it gets difficult rapidly. SVN was transparent most of the time (especially with TortoiseSVN. Even SourceSafe was easier (until you got to the point where it would break - just before launch usually)

        TTFN - Kent

        M 1 Reply Last reply
        0
        • K Kent Sharkey

          Agreed, and when stuff goes even slightly wrong, it gets difficult rapidly. SVN was transparent most of the time (especially with TortoiseSVN. Even SourceSafe was easier (until you got to the point where it would break - just before launch usually)

          TTFN - Kent

          M Offline
          M Offline
          MarkTJohnson
          wrote on last edited by
          #4

          Gimme good old PVCS, Lock those files down until I'm done with them.

          I’ve given up trying to be calm. However, I am open to feeling slightly less agitated.

          K 1 Reply Last reply
          0
          • M MarkTJohnson

            Gimme good old PVCS, Lock those files down until I'm done with them.

            I’ve given up trying to be calm. However, I am open to feeling slightly less agitated.

            K Offline
            K Offline
            Kent Sharkey
            wrote on last edited by
            #5

            As long as you weren’t the guy that locked files, then went camping for a month... :mad:

            TTFN - Kent

            1 Reply Last reply
            0
            • K Kent Sharkey

              Changelog[^]:

              Whatever comes next should be closer to how humans think

              "git reset --hard HEAD" is your friend

              Or at least mine

              T Offline
              T Offline
              Tasadit
              wrote on last edited by
              #6

              SubVersion is a far better solution for most projects in my experience.

              1 Reply Last reply
              0
              • K Kent Sharkey

                Changelog[^]:

                Whatever comes next should be closer to how humans think

                "git reset --hard HEAD" is your friend

                Or at least mine

                M Offline
                M Offline
                Marc Clifton
                wrote on last edited by
                #7

                It's a lot simpler if you don't use the command line. But for some reason using a UI to hide all the absurd and complicated switches and options is like walking into a biker bar and ordering a Shirley Temple. You get beaten up for no good reason.

                Latest Articles:
                Thread Safe Quantized Temporal Frame Ring Buffer

                K 1 Reply Last reply
                0
                • M Marc Clifton

                  It's a lot simpler if you don't use the command line. But for some reason using a UI to hide all the absurd and complicated switches and options is like walking into a biker bar and ordering a Shirley Temple. You get beaten up for no good reason.

                  Latest Articles:
                  Thread Safe Quantized Temporal Frame Ring Buffer

                  K Offline
                  K Offline
                  Kent Sharkey
                  wrote on last edited by
                  #8

                  Exactly, yeah. The burly CLI folk dominate in a lot of the discussions. Most of our team has standardized on GitHub Desktop, and it's great - as long as nothing goes wrong.

                  TTFN - Kent

                  M 1 Reply Last reply
                  0
                  • K Kent Sharkey

                    Exactly, yeah. The burly CLI folk dominate in a lot of the discussions. Most of our team has standardized on GitHub Desktop, and it's great - as long as nothing goes wrong.

                    TTFN - Kent

                    M Offline
                    M Offline
                    Marc Clifton
                    wrote on last edited by
                    #9

                    Kent Sharkey wrote:

                    Most of our team has standardized on GitHub Desktop,

                    I use SmartGit but my activities are really only create branches, commit, merge, resolve conflicts, and sometimes revert, which sucks (not SmartGit's fault) because you can't just merge the branch back in. Git thinks the changes have already been applied because it's in the commit change. I haven't dared to figure out how cherry picking works. One of my coworkers wants me to start doing pull requests. Given the repo is managed by BitBucket, which sucks, pull requests add a few precious minutes to the work day for each commit. And the only person qualified to review the changes is, well, basically me. So I fail to see the point, as I'd simply be approving my own pull requests! A very off-color NSFW analogy just popped into my head. :laugh:

                    Latest Articles:
                    Thread Safe Quantized Temporal Frame Ring Buffer

                    1 Reply Last reply
                    0
                    Reply
                    • Reply as topic
                    Log in to reply
                    • Oldest to Newest
                    • Newest to Oldest
                    • Most Votes


                    • Login

                    • Don't have an account? Register

                    • Login or register to search.
                    • First post
                      Last post
                    0
                    • Categories
                    • Recent
                    • Tags
                    • Popular
                    • World
                    • Users
                    • Groups