> I can imagine
> the mess someone might make trying to rewrite history on the remote repo.
That is what I am imagining also.
When/if the vote occurs to make the change, I will vote +0 - because I
don't like using Git, but I don't want to stand in the way of others
using it.
I'm looking forward to the benefits of the switch, but at the same time
I will most likely be the one who makes a mess of things in the main repo.
Adrian Crum
Sandglass Software
www.sandglass-software.com
On 4/23/2015 10:22 AM, Scott Gray wrote:
I'm just saying my current project has been using it for 18 months and it's
been a long time now since we've "lost" any changes. This is 15-30 devs
that were all new to git.
In my experience most issues come from:
- Reverting merge commits and picking the wrong mainline
- Pushing to the wrong remote branch
- Incorrectly handling conflicts
- Trying to force pushes
The most important thing is to stop when you mess something up and seek
help. Trying to fix things on the remote repo without understanding what
has gone wrong can make a bigger mess.
On second thought I'm almost hesitant to say git would be a good idea for
OFBiz because we have so many committers that would have access to the
master branch without an adequate level of git experience. I can imagine
the mess someone might make trying to rewrite history on the remote repo.
Regardless, I highly recommend git-svn for basic local development
or forking the git mirror if you want to go deeper.
Regards
Scott
On 23 April 2015 at 20:59, Adrian Crum <adrian.c...@sandglass-software.com>
wrote:
They are contradictions because they have been taken out of context.
I was responding to the suggestion that I don't like Git because I have
never used it. I have used it on three projects, and there have been
problems - even when "Git experts" use it. So, my dislike is based on my
experiences with Git, not on my lack of experience with it.
Adrian Crum
Sandglass Software
www.sandglass-software.com
On 4/23/2015 9:28 AM, Scott Gray wrote:
"I am thoroughly familiar with Git."
"Git always screws things up."
These two statements are complete contradictions. Outcomes in git only
appear strange while you're still unfamiliar with it.
I've been using the git-svn bridge to commit to OFBiz for about 4 years
and
using a git repo on my current project for the last 18 months or so.
Strange occurrences stopped happening for me after a couple of months and
generally stopped once all developers either stopped using git client UIs
that used settings they didn't understand or they started using the
command
line (which is exceedingly simple for basic workflows).
The value of feature branches and pull requests over patches cannot be
overstated IMO. The ability to easily multi-task on features, review pull
requests, keep a real commit history for contributed features, to
collaborate outside of the main repo puts git miles ahead of svn for
collaborative incremental software development.
Regards
Scott
On 20 April 2015 at 22:19, Adrian Crum <
adrian.c...@sandglass-software.com>
wrote:
I am thoroughly familiar with Git. I've used it on on three projects, and
that is why I don't like it.
I have a far easier time merging branches with Subversion. Git always
screws things up.
I don't need to be convinced of anything. I have my experience and my
opinion. But still, I'm not opposed to switching to Git.
Adrian Crum
Sandglass Software
www.sandglass-software.com
On 4/20/2015 11:08 AM, Taher Alkhateeb wrote:
One of the most difficult and challenging issue with branches is
_merging_
them. Git is a tool that is far more advanced in its feature set in that
area.
It seems some of the opinions expressed against git are due to
unfamiliarity. The only way to be convinced is to try it on an advanced
level as i don't think an email thread would be enough for convincing
anyone of the merits.
My 2 cents
Taher Alkhateeb
On Apr 20, 2015 12:54 PM, "Pierre Smits" <pierre.sm...@gmail.com>
wrote:
If we only want GIT for multiple local development branches, then we
are
doing for the wrong reasons. SVN doesn't hinder you in doing that
today.
Best regards,
Pierre Smits
*ORRTIZ.COM <http://www.orrtiz.com>*
Services & Solutions for Cloud-
Based Manufacturing, Professional
Services and Retail & Trade
http://www.orrtiz.com
On Mon, Apr 20, 2015 at 11:12 AM, Jacques Le Roux <
jacques.le.r...@les7arts.com> wrote:
Like Adrian and mostly for the same reasons, I don't believe we need
Git.
But there is one other major reason which has already been discussed
in
the other common ASF MLs. As Taher exulted, it's possible to create
local
branches. So people are able to do a lot of work alone without
exchanging
before committing or submitting. It will certainly not help to have
this
possibility. Remember our recent discussion on the lack or core
commits
reviews. With Git you end with commits bursts or big patches and it's
then
hard to review and too late to share ideas.
So unlike Adrian, I'm even strongly against it. I will not hesitate to
use
a -1 if necessary!
Jacques
Le 20/04/2015 09:53, Adrian Crum a écrit :
I don't agree that "all major contributors are using git."
Personally, I find Git to be an overly complicated solution to a
simple
problem. It frequently does bizarre things that no one understands,
and
you
are left with things being mysteriously reverted for unknown reasons.
This isn't a -1 vote though. I'm just making it clear that I will be
dragged kicking and screaming into using it.
Adrian Crum
Sandglass Software
www.sandglass-software.com
On 4/20/2015 5:38 AM, Hans Bakker wrote:
As discussed at apachecon in Austin, i propose to switch from svn
to
git
for the ofbiz repository. The main reason being that all major
contributors are using git and contributions are cumbersome, further,
git allows for better branching and merging.
Regards,
Hans
