3 ms·
"I want 1 codebase, developed linearly." Then, when you want to commit your branch, rebase the branch from your master before merging. Then, when you merge, th
by jerf 17y ago
"I want 1 codebase, developed linearly."
Then, when you want to commit your branch, rebase the branch from your master before merging. Then, when you merge, the patches will show up all in a row at the point you commit, as if they were all done in a row. Essentially, this is exactly what happens when you are working with subversion for a couple of days and then do several commits at the end.
Except you can trivially have multiple of these things going at a time.
I'm going to ask you a question: Have you actually tried git or anything for a significant period of time, like, at least a couple weeks? (Not just "yeah, 5 minutes.") If not, I'd point out that you're speculating about how git might affect workflow to people who actually know how git affects workflow, since they are living it. (And if so, you're not doing a great job of showing that you tried it.)
- axod 17y agoYes I tried it for a day (Not long I agree). It looked like a reasonably copy of svn, but it didn't offer me anything. Let me restate: I do not like branches and use them very rarely. So, to the guy who hates branches, what does git offer me over svn (Which does all I need at the moment)?
- plinkplonk 17y ago"So, to the guy who hates branches, what does git offer me over svn (Which does all I need at the moment)?" The ability to version control your project (even without branching you can checkin) when disconnected (from your network).
- axod 17y agoYes, I do this with svn easily enough (Local install of svn). Simple enough... Maybe that's a good selling point for people who aren't connected to the net much though,
- plinkplonk 17y ago"Yes, I do this with svn easily enough (Local install of svn). Simple enough..." Yeah Right :-P Obviously I meant if you were working on a project with its repository on a remote server. Assuming you want local version control (as you seemt o do, since you are locally installing svn) you'd maintain a separate local repository, maintain the same project under both, and synch them both when you get back online? And if you had two laptops say (apart from the remote server) , you'd maintain 3 repositories?
- axod 17y agoIt's not really a use case I have. If I'm working, I have internet connectivity :/