This sounds something akin to: "If I am the only developer, and I am only making small changes, why would I ever need separate production source?". Now I know there are guys that make changes to the production source, but in my mind, that is playing with fire. Having a master branch that is always stable production ready code is like maintaining production source. Instead of copying your source to a dev library, making changes, and then migrating back to the production library when your changes are ready (the RPG way), you branch off the master, make changes, and merge back into the master when your changes are ready.
But this is not just a way to keep your production source pristine. It also gives you a better way to abandon changes without leaving all that clutter in the repository, just delete the unmerged branch, problem solved. And, now when you add a new developer, he just follows the same process. Git helps you manage the conflicts.
There is an excellent link on the yips wiki to a blog post detailing successful Git branching:
http://nvie.com/posts/a-successful-git-branching-model/
Mark Murphy
STAR BASE Consulting, Inc.
mmurphy@xxxxxxxxxxxxxxx
-----Paul Nicolay <Paul.Nicolay@xxxxxxxxxx> wrote: -----
To: "Rational Developer for IBM i / Websphere Development Studio Client for System i & iSeries" <wdsci-l@xxxxxxxxxxxx>
From: Paul Nicolay <Paul.Nicolay@xxxxxxxxxx>
Date: 08/04/2015 07:54AM
Subject: Re: [WDSCI-L] EDi 9.1 and eGit
But it doesn't even answer the most basic question... why should I branch for just a small fix in a program, or even for writing an additional program ? To me it feels like doing lots of useless work since the chance of conflicts is so small (but maybe that's the nature of RPG programming which is non intrusive) that a warning on a merge is more than sufficient.
So I'm looking for a concrete example on how to do this with eGit as I posted recently (which BTW introduces an issue when different members are changed by both users).
I just don't understand that something as simple as I'm trying to do causes me so many headaches :-(
________________________________________
From: WDSCI-L [wdsci-l-bounces@xxxxxxxxxxxx] on behalf of Wilson, Jonathan [piercing_male@xxxxxxxxxxx]
Sent: Tuesday, August 04, 2015 12:45
To: Rational Developer for IBM i / Websphere Development Studio Client for System i & iSeries
Subject: Re: [WDSCI-L] EDi 9.1 and eGit
On Tue, 2015-08-04 at 09:13 +0000, Paul Nicolay wrote:
I have found this site
https://git-scm.com/book/en/v2/Git-Branching-Rebasing to be really good,
nice and simple and point by point.
midrange.com
