Re: Git merge question

2013-05-08 Thread Chip Childers
Yes, git is a completely different workflow. Branch frequently... commit frequently... On Wed, May 8, 2013 at 9:23 PM, Mike Tutkowski wrote: > I see...maybe a local commit would have been preferable. > > I'm used to not committing until I have the code in a stable state > (probably typical with

Re: Git merge question

2013-05-08 Thread Mike Tutkowski
I see...maybe a local commit would have been preferable. I'm used to not committing until I have the code in a stable state (probably typical with centralized VCSs like SVN), but with my local repo I suppose it doesn't matter as much. On Wed, May 8, 2013 at 5:45 PM, Chip Childers wrote: > On Mo

Re: Git merge question

2013-05-08 Thread Chip Childers
On Mon, May 06, 2013 at 11:21:47AM -0600, Mike Tutkowski wrote: > Hi everyone, > > I've used SVN for many years, but am a bit new to Git. > > I've been making changes locally in my repo for a while and wanted to > update my repo from the "upstream" repo, but do not want to first stage or > commit