Re: Merge Tool for git for z/OS?

2019-12-03 Thread Seymour J Metz
Sent: Tuesday, December 3, 2019 9:44 AM To: IBM-MAIN@LISTSERV.UA.EDU Subject: Re: Merge Tool for git for z/OS? Yes. 😊 Use XEDIT and CMSUPDTE. They work well, but are VM only, -Original Message- From: IBM Mainframe Discussion List On Behalf Of ITschak Mugzach Sent: Tuesday, December 03, 2

Re: Merge Tool for git for z/OS?

2019-12-03 Thread Paul Gilmartin
On Tue, 3 Dec 2019 09:44:11 -0500, Lloyd Fuller wrote: >Yes. 😊 Use XEDIT and CMSUPDTE. They work well, but are VM only, > Sigh. ISRSUPC PARM=UPDCMS8 will generate usable CMSUPDTE diffs if the OLD file has valid sequence numbers. ISRSUPC PARM=UPDMVS8 requires that both OLD and NEW have valid s

Re: Merge Tool for git for z/OS?

2019-12-03 Thread Lloyd Fuller
Yes. 😊 Use XEDIT and CMSUPDTE. They work well, but are VM only, -Original Message- From: IBM Mainframe Discussion List On Behalf Of ITschak Mugzach Sent: Tuesday, December 03, 2019 9:42 AM To: IBM-MAIN@LISTSERV.UA.EDU Subject: Re: Merge Tool for git for z/OS? Lionel, Many years

Re: Merge Tool for git for z/OS?

2019-12-03 Thread ITschak Mugzach
Lionel, Many years ago we developed a change management tool for an Israeli client that ued CA datacom based on SCLM. We used to perform merge by comparing the two versions (Ispf SUPERC). When configured it is a smart tool that tels you the location, if it is new line or update inline, etc. Try t

Merge Tool for git for z/OS?

2019-12-03 Thread Lionel B Dyck
What is available to be used for the mergetool for git on z/OS? Thanks I've looked using google/bing without success. Lionel B. Dyck < Website: http://www.lbdsoftware.com "Worry more about your character than your reputation. Character is what you are