Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 159

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 162

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 165

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 168

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 171

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 173

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 175

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 197

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 201

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 224

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 225

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 226

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 316

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 316

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 316

Warning: Creating default object from empty value in /home/jfcouture/jfcouture.com/wp-content/themes/platform/core/library/class.layout.php on line 316
The Guerilla Guide To Git: How To Start Using Git, Even If Your Team Is On Svn

I’ve been using git for three months now and it has had zero impact on my team. They weren’t even aware I was using it for the first few weeks. That means, you can start using it now, for your personal development, without having to convince anybody.

Git comes with a svn wrapper. You can import your svn repository to a local git repository. You then get all the advantages of git: easy branching/merging, offline operation(very useful if you work with a laptop), etc.

$ git svn clone http://path/to/svn -T trunk -t tags -b branches

This command will import all the revisions from svn and create branches in your git repository (one for trunk, and one for all your branches). You will be on a branch master (linked to trunk) and can start working. You commit normally to your repository.

When you are ready to send your changes back to svn:

$ git svn rebase # (equivalent to svn update)
$ git svn dcommit # (equivalent to svn commit)

Rebase works by reverting your changes, getting the latest revisions from svn, and then reapplying your changes. You resolve any conflicts (if there any). The last command then pushes your changes to svn for your team to enjoy.

Those are the three commands you need to know to use git with svn.

Caveats

Svn:externals are not supported. I suggest you use piston to handle them.

Check out the git svn docs for a few more things to watch out for.

Conclusion

Now that your team has seen you using git successfully for weeks, it will be much easier to get them to switch!

Popularity: 21% [?]

 

4 Responses to The Guerilla Guide To Git: How To Start Using Git, Even If Your Team Is On Svn

  1. Ben says:

    I feel like switching before christmas ’07…

  2. [...] you are currently using svn, see my guide on how to start using git while keeping a central svn [...]

  3. Mphu says:

    “close left panel” or “close right panel”.11. A super easy one! I’d suggest addnig Ctrl and = as an alternate keyboard shortcut for zoom in. It’s confusing to be able to just use the Ctrl modifier to zoom out (Ctrl and -) but to need to use shift as well to zoom in (Ctrl, shift and = to zoom in).12. Clicking to the right of the breadcrumb trail is a really nice way to access typing the path as it lets you be much more inaccurate than clicking an icon. Trouble is that nothing indicates you can do this. What would be amazing would be if when you hovered over the area you can click to do this, if it faded in something to let you know you can do this eg “Click to type the file path instead.”13. Columns. Beautiful. Who cares if it’s from Apple. They grabbed most of their desktop effects from us, anyway. ;-) 14. Lastly but not least, thankyou for all the usability enhancements. They are all appreciated, from the extensive shortcuts, to the clear layout, to finally showing diskspcae clearly. These are the everyday things that make a new average user feel like KDE runs a system that they can be even more comfortable with. You’ve done an awesome job, and as you can see I had to look hard to find *anything* I would improve. In short. You (and Dolphin) rock!

  4. Vivek says:

    - Thanx for your revelation to not use the eitarxmenpel features if I don’t like them. I’m fairly certain the point of the development channel is to test out items that are under development. Useless additions that offer zero functionality are not testable and undeveloped. As such, Google receives no developmental input from usage and only serves to create negative confusion from those who may have activated the function and then incorrectly complain the browser itself is poor.My ‘griping’ is in reality the only constructive criticism about the eitarxmenpel new tab function to date. I guess you feel if I provided the hundredth opinion on the new logo or corrected a minor spelling mistake Google would have somehow benefited more. You would be wrong.Experimental features are wonderful and a great way to try out potentially new functionality. Completely unusable features offer no function, no features, no benefits and no experimentation. Providing any level of end user with a non-functional option is irrelevant and pointless with zero benefits to either party.

Leave a Reply

Your email address will not be published. Required fields are marked *

*

You may use these HTML tags and attributes: <a href="" title=""> <abbr title=""> <acronym title=""> <b> <blockquote cite=""> <cite> <code> <del datetime=""> <em> <i> <q cite=""> <strike> <strong>