Re: suggested git workflow/s

yes - i'm just talking about public branches - local branches are part of the suggestion. regards, gerhard 2012/1/4 Jason Porter lightguard...@gmail.com That's not exactly how it would work though, what we want to avoid is merge commits, so branches are fine, but they need to be fast

suggested git workflow/s

hi @ all, mark added some additional suggestions to the wiki [1]. besides that we have to discuss further topics like: - file encoding - line-endings - usage of special characters regards, gerhard [1] https://cwiki.apache.org/confluence/display/DeltaSpike/Suggested+Git+Workflows

Re: git workflow

lightguard...@gmail.com To: deltaspike-dev@incubator.apache.org deltaspike-dev@incubator.apache.org Cc: deltaspike-dev@incubator.apache.org deltaspike-dev@incubator.apache.org Sent: Tuesday, December 20, 2011 8:58 PM Subject: Re: git workflow Preference here, but -1 for rebase merging. I

git workflow

hi @ all, feel free to add your suggestions to [1]. regards, gerhard [1] https://cwiki.apache.org/confluence/display/DeltaSpike/Suggested+Git+Workflows

Re: git workflow

@incubator.apache.org Cc: deltaspike-dev@incubator.apache.org deltaspike-dev@incubator.apache.org Sent: Tuesday, December 20, 2011 8:58 PM Subject: Re: git workflow Preference here, but -1 for rebase merging. I personally like seeing where everything came from. I get scared when I see people suggesting