Announcement: Be excellent to each other.


Caravel Forum : Caravel Boards : Development : Should I be a git (user)?
New Topic New Poll Post Reply
Poster Message
Syntax
Level: Smitemaster
Rank Points: 1217
Registered: 05-12-2005
IP: Logged
icon Should I be a git (user)? (0)  
Not related to DROD but was wondering if anyone had made the migration from svn (or other) to git?

I'm considering doing it with our codebase but not 100% convinced it's worth the time to do so. We're a small dev team (but globally distributed) so maybe the benefits aren't as apparent - though merging branches in svn is a nightmare which was my original idea why to switch.
05-20-2012 at 01:52 PM
View Profile Send Private Message to User Show all user's posts Quote Reply
west.logan
Level: Smitemaster
Avatar
Rank Points: 585
Registered: 03-09-2011
IP: Logged
icon Re: Should I be a git (user)? (0)  
It seems like I may have asked a similar question about a year ago.

I used Git briefly for version control on the LaTeX files I was using (we republished a few books) but not very much. I'm not very knowledgeable on it but couldn't the dev team treat it like svn if they wanted to? I thought one could use svn commands.

____________________________
-Logan
05-20-2012 at 01:58 PM
View Profile Send Private Message to User Send Email to User Show all user's posts This architect's holds Quote Reply
Syntax
Level: Smitemaster
Rank Points: 1217
Registered: 05-12-2005
IP: Logged
icon Re: Should I be a git (user)? (0)  
Yeah they could but that would beat what I consider the advantages of switching. They're also not all on Linux and it seems git is not Windows-friendly...

In any case, I'd like to know how easy a merge is in git compared to svn as that's a current issue
05-20-2012 at 02:07 PM
View Profile Send Private Message to User Show all user's posts Quote Reply
Keiya
Level: Delver
Rank Points: 52
Registered: 03-25-2012
IP: Logged
icon Re: Should I be a git (user)? (0)  
There's tools for Git on Windows. It's a bit slower than on 'nix, but it works.

Branch merges in Git are nearly trivial, especially if there's no conflicting changes. They kinda have to be, since each person's copy of the repo is effectively a branch... Of course you'll want to manually verify it to make sure there's no weird interactions, and if the same part of the same file was changed in both a human needs to sort that out... but those are kinda unavoidable.

____________________________
636th Trapdoor Replacer

Official Hold Progress:
Click here to view the secret text

05-23-2012 at 07:57 AM
View Profile Send Private Message to User Show all user's posts Quote Reply
New Topic New Poll Post Reply
Caravel Forum : Caravel Boards : Development : Should I be a git (user)?
Surf To:


Forum Rules:
Can I post a new topic? No
Can I reply? No
Can I read? Yes
HTML Enabled? No
UBBC Enabled? Yes
Words Filter Enable? No

Contact Us | CaravelGames.com

Powered by: tForum tForumHacks Edition b0.98.8
Originally created by Toan Huynh (Copyright © 2000)
Enhanced by the tForumHacks team and the Caravel team.