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. The Lounge
  3. Online Git Reference

Online Git Reference

Scheduled Pinned Locked Moved The Lounge
collaborationtutorialquestion
19 Posts 8 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.
  • M Marc Clifton

    Throw out everything you know about SVN, and particularly, throw out your mental model of how SVN works. Git works completely differently, and it helps to have the right mental model, starting with "everything lives on my computer locally -- branches, commits, the whole nine yards -- and the remote repository is only there to share work that I explicitly push up to it." Also, the other mental model is "everything I do, I do locally, such as commits and merges, switch branches, etc., and none of this affects the remote repository until I push the changes." That helped me get a lot further along in understanding the git model a lot better, as I was finding the mismatch between my SVN mental model and Git's to be a rather hair pulling experience. Also, "git reset --hard" is your friend. :) [edit]Also, I would "invest" in a good Git UI tool. I'm using SmartGit/Hg, which is OK. However, there are times when the command line is absolutely necessary. And finally, practice doing manual merges when rebase fails due to unresolvable conflicts. Merging manually and getting git out of the "rebase in progress" (or whatever it is) state is, in my experience, such a royal PITA that I often got hard reset and manually fold my changes back in rather than dealing with the idiotic <<<<<<< and >>>>>> representations of changes that it injects into my files. Not that that is any different from other source control systems, so I can't quite blame Git for that, except to say that it's merge process sucks as compared to how well SVN's works. Marc

    Automating Semantic Mapping of a Document With Natural Language Processing

    R Offline
    R Offline
    Rage
    wrote on last edited by
    #10

    Git is only different from SVN if you want to use it as a distributed version control system. You can set it up to work "centralized" like SVN.

    ~RaGE();

    I think words like 'destiny' are a way of trying to find order where none exists. - Christian Graus Entropy isn't what it used to.

    Kornfeld Eliyahu PeterK 1 Reply Last reply
    0
    • R Rage

      Git is only different from SVN if you want to use it as a distributed version control system. You can set it up to work "centralized" like SVN.

      ~RaGE();

      I think words like 'destiny' are a way of trying to find order where none exists. - Christian Graus Entropy isn't what it used to.

      Kornfeld Eliyahu PeterK Offline
      Kornfeld Eliyahu PeterK Offline
      Kornfeld Eliyahu Peter
      wrote on last edited by
      #11

      Rage wrote:

      You can set it up to work "centralized" like SVN

      In which case it's not Git anymore...

      I'm not questioning your powers of observation; I'm merely remarking upon the paradox of asking a masked man who he is. (V)

      "It never ceases to amaze me that a spacecraft launched in 1977 can be fixed remotely from Earth." ― Brian Cox

      1 Reply Last reply
      0
      • A Albert Holguin

        I'm reading up on Git because I'm using it at work now and the tutorial I'm reading keeps referencing SVN. You'd figure if you're writing a tutorial on Git and referencing SVN it's because you know both extensively, but as I read it, I'm seeing statements that are completely wrong about SVN. The author seems to only know about SVN superficially... but why compare them at all?

        M Offline
        M Offline
        Mark_Wallace
        wrote on last edited by
        #12

        If ya wanna refer to an on-line git, all you need to do is type my name.

        I wanna be a eunuchs developer! Pass me a bread knife!

        K 1 Reply Last reply
        0
        • A Albert Holguin

          I'm reading up on Git because I'm using it at work now and the tutorial I'm reading keeps referencing SVN. You'd figure if you're writing a tutorial on Git and referencing SVN it's because you know both extensively, but as I read it, I'm seeing statements that are completely wrong about SVN. The author seems to only know about SVN superficially... but why compare them at all?

          J Offline
          J Offline
          jschell
          wrote on last edited by
          #13

          Albert Holguin wrote:

          You'd figure if you're writing a tutorial on Git and referencing SVN it's because you know both extensively,...

          Well there you go - that is the source of your problem. Being able to write, regardless of the topic, doesn't mean that one actually knows the subject being written about.

          K 1 Reply Last reply
          0
          • M Mark_Wallace

            If ya wanna refer to an on-line git, all you need to do is type my name.

            I wanna be a eunuchs developer! Pass me a bread knife!

            K Offline
            K Offline
            KP Lee
            wrote on last edited by
            #14

            I've heard people called a git before, I've never seen a definition, but I've felt it was a cross between an idiot and an opinionated a-hole. Was that what you were thinking when you talked about typing your name? :)

            M 1 Reply Last reply
            0
            • K KP Lee

              I've heard people called a git before, I've never seen a definition, but I've felt it was a cross between an idiot and an opinionated a-hole. Was that what you were thinking when you talked about typing your name? :)

              M Offline
              M Offline
              Mark_Wallace
              wrote on last edited by
              #15

              It's not complimentary, but I'm English, so I don't demand that people call me nice names all the time.

              I wanna be a eunuchs developer! Pass me a bread knife!

              K 1 Reply Last reply
              0
              • M Mark_Wallace

                It's not complimentary, but I'm English, so I don't demand that people call me nice names all the time.

                I wanna be a eunuchs developer! Pass me a bread knife!

                K Offline
                K Offline
                KP Lee
                wrote on last edited by
                #16

                FYI, I wasn't calling anyone a git, just checking on your understanding of the English usage of the word vs. the computer usage. It's nice to know that I didn't insult you, the English have a rep for being easily insulted. I think we Americans are sometimes considered so thick-headed, we can't tell when we are being insulted. For instance, I'm quite sure you didn't mean to insult me, so if I misunderstood, I apologize. My excuse is that I'm American.

                M 1 Reply Last reply
                0
                • J jschell

                  Albert Holguin wrote:

                  You'd figure if you're writing a tutorial on Git and referencing SVN it's because you know both extensively,...

                  Well there you go - that is the source of your problem. Being able to write, regardless of the topic, doesn't mean that one actually knows the subject being written about.

                  K Offline
                  K Offline
                  KP Lee
                  wrote on last edited by
                  #17

                  jschell wrote:

                  Being able to write, regardless of the topic, doesn't mean that one actually knows the subject being written about.

                  Being part of a huge company doesn't make it better. Just to verify my understanding of the UNICODE definition I checked SQL Server's help definition. They are still using an ASCII character as an example for using UNICODE. ASCII is a subset of UNICODE, so it's valid usage, but you'd think they'd use a character that can't be put in a varchar field as an example.

                  1 Reply Last reply
                  0
                  • K KP Lee

                    FYI, I wasn't calling anyone a git, just checking on your understanding of the English usage of the word vs. the computer usage. It's nice to know that I didn't insult you, the English have a rep for being easily insulted. I think we Americans are sometimes considered so thick-headed, we can't tell when we are being insulted. For instance, I'm quite sure you didn't mean to insult me, so if I misunderstood, I apologize. My excuse is that I'm American.

                    M Offline
                    M Offline
                    Mark_Wallace
                    wrote on last edited by
                    #18

                    KP Lee wrote:

                    the English have a rep for being easily insulted

                    :thumbsup::thumbsup::thumbsup: Nice one! Best joke I've heard for weeks!

                    I wanna be a eunuchs developer! Pass me a bread knife!

                    K 1 Reply Last reply
                    0
                    • M Mark_Wallace

                      KP Lee wrote:

                      the English have a rep for being easily insulted

                      :thumbsup::thumbsup::thumbsup: Nice one! Best joke I've heard for weeks!

                      I wanna be a eunuchs developer! Pass me a bread knife!

                      K Offline
                      K Offline
                      KP Lee
                      wrote on last edited by
                      #19

                      Mark_Wallace wrote:

                      Best joke I've heard for weeks!

                      Glad you could tell my tongue was firmly in cheek. I'm yank born, but my ancestral (Norway) rep isn't in intelligence. You really can't judge a book by its cover.

                      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