who here uses git?

[Cogman]

Honestly it's kinda a mess. Sometimes we even exchange code through Facebook chat. D: Used to use MSN till they shut it down but equally as bad. I wrote a program that basically goes through each script and counts the lines of code and generates a header and if the file changed it puts the name of the last person that modified it but there's not really any tracking beyond that. Before we give each other code we run the program, normally, sometimes... lol It also puts the path in the header, as the application will look in a "new scripts" folder and then copy any files to the path that's in the header but recently that part broke and files were ending up in the wrong place.

Git does indeed sound like it could make the workflow much better. We're only 2 on the project right now and we tend not to update stuff often but still a pain at times as we have to manually keep each other's distros updated.

So yeah, definitely going to look into using Git or SVN. Something that has been on the back of my mind for a while.

Do it now, you'll be glad you did.

 

[IHateMyJob2004]

Went from CVS to GIT at work. Hated the transition but now I hate using CVS when maintaining one older project.

Those not using Git, SVN or CVS ...... DO IT NOW! Especially if getting paid to do work. Or if working with multiple developers. Any company not on some VCS needs to fix that ... yes fix ..... because their practices are broken in a very fundamental way.

 

[Zxian]

Honestly it's kinda a mess. Sometimes we even exchange code through Facebook chat. D: Used to use MSN till they shut it down but equally as bad. I wrote a program that basically goes through each script and counts the lines of code and generates a header and if the file changed it puts the name of the last person that modified it but there's not really any tracking beyond that. Before we give each other code we run the program, normally, sometimes... lol It also puts the path in the header, as the application will look in a "new scripts" folder and then copy any files to the path that's in the header but recently that part broke and files were ending up in the wrong place.

Git does indeed sound like it could make the workflow much better. We're only 2 on the project right now and we tend not to update stuff often but still a pain at times as we have to manually keep each other's distros updated.

So yeah, definitely going to look into using Git or SVN. Something that has been on the back of my mind for a while.

Git with the program!

 

[purbeast0]

Went from CVS to GIT at work. Hated the transition but now I hate using CVS when maintaining one older project.

Those not using Git, SVN or CVS ...... DO IT NOW! Especially if getting paid to do work. Or if working with multiple developers. Any company not on some VCS needs to fix that ... yes fix ..... because their practices are broken in a very fundamental way.

yeah i hated git at first after being so used to svn, and then i kept trying to use git like svn. i hated git because it was not straight forward and just hard to use correctly, and different than svn. now i love it.

one thing that really has helped me with git is drawing the tree out when trying to explain how things work. it is kinda like how i learned how linked lists worked with drawing it out on paper back in the day.

 

[Graze]

I use Git and really like it. I didn't think there was much of a learning curve but I only use it for my own personal stuff so I am guess I am not using many features.

 

[purbeast0]

I use Git and really like it. I didn't think there was much of a learning curve but I only use it for my own personal stuff so I am guess I am not using many features.

if you are simply using it to keep 1 master branch, then yeah it's really simple to use for sure. especially if you aren't even pushing it and are the only one working on the code.

when you have a remote repository, and have 3 "working" branches (dev/staging/prod), then a bunch of branches all over the place, things can get pretty complicated.

 

[Cogman]

if you are simply using it to keep 1 master branch, then yeah it's really simple to use for sure. especially if you aren't even pushing it and are the only one working on the code.

when you have a remote repository, and have 3 "working" branches (dev/staging/prod), then a bunch of branches all over the place, things can get pretty complicated.

Ah, but that is the beauty of it. Try doing something like that with SVN, it is really painful. Git allows for very flexible and complex repo organization.

 

[Crusty]

if you are simply using it to keep 1 master branch, then yeah it's really simple to use for sure. especially if you aren't even pushing it and are the only one working on the code.

when you have a remote repository, and have 3 "working" branches (dev/staging/prod), then a bunch of branches all over the place, things can get pretty complicated.

When merging from upstream repositories I find git rebase to be much better than creating merge commits all over the place. Not only does it help keep your commit history clean it also preserves the linearity of commits.

 

[GregGreen]

Have used git on at work for the past couple jobs and at home for the past few years. I'm not a huge veteran of version control systems -- SVN was the first one I used and have only really used git since then, although I have done some reading about hg.

At first with Git, there is a little bit more of a learning curve, but once you get over that little step, it is so much easier than SVN to do anything (and really, its really only one extra step for basic usage -- `git commit + git push` instead of just `svn commit`, which was about all anyone I worked with was ever willing to do with SVN). SVN is kind of a nightmare for anything more than a very simple, sequential non-branched workflow.

Git makes working in an async, branched workflow easy. Even if you aren't real sure what is going on, it's a pretty simple process usually, so a teammate can easily tell you what to type.

I recommend the CLI workflow over one of the GUIs because you actually learn what is going on. Even if you don't understand the commands fully, you are typing them in instead of hitting some button in the GUI that might run 5 commands. I think it also makes you more likely to learn new, more advanced ways of doing things since you are likely to actually use the git documentation. I don't think I would have ever learned how to use `git bisect` if I hadn't been poking around on git-scm.com looking for something else.

 

[purbeast0]

When merging from upstream repositories I find git rebase to be much better than creating merge commits all over the place. Not only does it help keep your commit history clean it also preserves the linearity of commits.

yeah rebasing took me a little while to "get" and once my coworker drew it out on the whiteboard for me, it clicked and made complete sense. and when you merge a branch back into it's originating branch after a rebase, yes the tree looks super clean. you just see a dimple out to the side that goes right back in .

 

[paperwastage]

So yeah, definitely going to look into using Git or SVN. Something that has been on the back of my mind for a while.

Benefit of git: you don't HAVE to set up a server/host to be the "repository"

You can set up the git repository on your local machine (takes 5 minutes to install, 5 minutes to learn the basics), and can work offline forever if you don't have to share the code

svn: you need to install the package on a machine which acts as the "server"

 

[pauldun170]

yeah i like to give it grief, but it's actually not TOO bad. it has caused me grief and screwed up my workspace once or twice, but compared to clearcase it is a gift from god :biggrin:

Holy crap...
Its been years since I used Clearcase and just seeing the word in your post made me cringe a little.
It was a happy day when we got rid of Clearcase\Requisite Pro\Clearquest and got RTC\RAD all set up.

 

[dave_the_nerd]

Holy crap...
Its been years since I used Clearcase and just seeing the word in your post made me cringe a little.
It was a happy day when we got rid of Clearcase\Requisite Pro\Clearquest and got RTC\RAD all set up.

We ditched ClearCase a while back but still use ClearQuest.

It's not THAT bad.

The (heavily customized) software dev workflow we have in CQ is basically untranslatable to JIRA, which management wants to move to. But it's been on CQ so long there's probably a "who made who" problem. Anyway, developers hate workflow change more than tool changes.

 

[slugg]

I use SVN, TFS, and Git. As far as Git goes, I use TortoiseGit for viewing commit logs, adding/deleting files, resolving conflicts, and committing. I use the CLI for pretty much everything else. Works well enough for me.

Git is definitely the best generalized SCM I've ever used. SVN is just ridiculously widespread in enterprise apps, so there's no getting away from it. TFS is freaking awesome, but if and only if you're 100% inside of Visual Studio, which is highly unlikely.

Some of the Git terminology makes no sense to me. A lot of it is as if it's backwards. I just take it at face value and accept it. Otherwise, it's pretty good.

 

[Net]

a good GUI app for git is https://www.sourcetreeapp.com/

 

[oMega_2093]

Hi there,

I use Git on a daily basis for personal projects. At work, they don't even know what VCS are. And I hate them for that. They are stuck on having code spread on various hard disks, that typical "my version is canon" and the like. They see me as some kind of religious fanatic with elitist views on everything programming. And I hate them for that too.

It's like "poor guys, they don't know what they are doing to themselves".

The more you learn about Git the more productive and confortable you are. Start using it ASAP, mate.

 

[paperwastage]

Hi there,

I use Git on a daily basis for personal projects. At work, they don't even know what VCS are. And I hate them for that. They are stuck on having code spread on various hard disks, that typical "my version is canon" and the like. They see me as some kind of religious fanatic with elitist views on everything programming. And I hate them for that too.

It's like "poor guys, they don't know what they are doing to themselves".

The more you learn about Git the more productive and confortable you are. Start using it ASAP, mate.

you slowly get your teammates to support it... show them features, how it works etc

I finally got my teammates (non-technical side) to buy into using notepad++ (instead of regular notepad)... took some time, but they understand why it's better and is slowly using the "advanced" features that notepad++ provides...

one step at a time