×
The internal search function is temporarily non-functional. The current search engine is no longer viable and we are researching alternatives.
As a stop gap measure, we are using Google's custom search engine service.
If you know of an easy to use, open source, search engine ... please contact support@midrange.com.
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.
As an Amazon Associate we earn from qualifying purchases.
This mailing list archive is Copyright 1997-2024 by midrange.com and David Gibbs as a compilation work. Use of the archive is restricted to research of a business or technical nature. Any other uses are prohibited. Full details are available on our policy page. If you have questions about this, please contact
[javascript protected email address].
Operating expenses for this site are earned using the Amazon Associate program and Google Adsense.