Re: EDi 9.1 and eGit

On Mon, 2015-08-03 at 20:29 +0000, Paul Nicolay wrote:

Quoting from one of your posts...

"the fact that Git effectively makes branching obligatory before a developer can even begin work does suggest that things could get out of hand quite quickly."

Well the master branch must exist :-/

... clearly indicates that I'm missing something.

As long as I don't have conflicts it works fine without a single branch... but does it mean I need them or not ?

Yeah I'm fairly sure the first thing that should be done is create a
branch off the master. On my setup I created 3 orphaned branches
"master" "original" and "development" which initially stored almost the
same things... development has progressed, however if the branch
"development" was a primary branch and I was doing this in a multi user
set up I would make each user create their own branch after first
checking out the primary/master branch.

Only when all development was complete would the local branches be
pushed and merged into the primary branch on the master repository.

Its also possible when 2 people are doing stuff on a branch from a
branch to pull direct from their repository, merge the changes locally
to the master branch, then carry on working and all your sources should
(should!) now show the changes even though the "central/master"
repository has not yet recieved the changes to its master.

It's very flexible, but at the same time the concept of no "one true
master" (unless you want and set up one) can be a bit of a "do what?"
the first time.

-----Original Message-----
From: WDSCI-L [mailto:wdsci-l-bounces@xxxxxxxxxxxx] On Behalf Of John Yeung
Sent: maandag 3 augustus 2015 21:53
To: Rational Developer for IBM i / Websphere Development Studio Client for System i & iSeries
Subject: Re: [WDSCI-L] EDi 9.1 and eGit

On Mon, Aug 3, 2015 at 2:57 PM, Paul Nicolay <Paul.Nicolay@xxxxxxxxxx> wrote:

The whole idea of branches (both on the repository and local) and the need for them is still a bit unclear to me (Subversion was easier in that context).

The mindset needed for Git has some significant differences compared to SVN. Both of them are such established software that there are a number of guides meant to ease the transition. Google around (for example, "git for subversion users") and check 'em out. A few that came up near the top for me:

http://git-scm.com/course/svn.html
http://www.git-tower.com/blog/git-for-subversion-users-cheat-sheet/
http://www.ibm.com/developerworks/library/l-git-subversion-1/
https://git.wiki.kernel.org/index.php/GitSvnCrashCourse
http://stackoverflow.com/questions/1042280/is-there-a-subversion-users-guide-to-git

One big fundamental, philosophical difference between Git and SVN is that Git is designed to be distributed. There's not an inherent, centralized, master repository. All the copies are peers. It's only by convention (not by structure or by rule) that any one repo is the "official" one.

Fair warning: I only have passing familiarity with Git, and I don't really know SVN at all. But I found the following fairly old blog post easy to read, and it seems to explain well the philosophical differences between Git and SVN. (Most of the other guides seem to focus on translating SVN commands to Git commands so you can start "doing stuff" as soon as possible, without worrying too much about whether you actually *understand* Git.)

http://pointbeing.net/weblog/2009/09/git-for-subversion-users.html

Presumably, with an IDE plugin, you won't usually be typing the actual Git commands, but just clicking some buttons on your IDE. But it will probably help to at least learn Git's terminology and understand its principles.

John Y.
--
This is the Rational Developer for IBM i / Websphere Development Studio Client for System i & iSeries (WDSCI-L) mailing list To post a message email: WDSCI-L@xxxxxxxxxxxx To subscribe, unsubscribe, or change list options,
visit: http://lists.midrange.com/mailman/listinfo/wdsci-l
or email: WDSCI-L-request@xxxxxxxxxxxx
Before posting, please take a moment to review the archives at http://archive.midrange.com/wdsci-l.