tag:blogger.com,1999:blog-14934996.post120657978756323391..comments2023-08-26T01:35:40.671-07:00Comments on Bruce Armstrong's blog: PowerBuilder 2017 R2 New Feature: Git source control supportBruce Armstronghttp://www.blogger.com/profile/06531990923901345957noreply@blogger.comBlogger4125tag:blogger.com,1999:blog-14934996.post-39368345079029351822020-09-16T18:22:51.231-07:002020-09-16T18:22:51.231-07:00The only thing PowerBuilder uses TortoiseGit for i...The only thing PowerBuilder uses TortoiseGit for is to view difs and the commit log. Was it working before you updated the setting?<br /><br />I don't review the comments on the blog very regularly. You would be better off posting a question in the Appeon forums.Bruce Armstronghttps://www.blogger.com/profile/06531990923901345957noreply@blogger.comtag:blogger.com,1999:blog-14934996.post-9365838475222163802020-07-31T12:58:17.212-07:002020-07-31T12:58:17.212-07:00After using TortiseGit, and adding the setting, I ...After using TortiseGit, and adding the setting, I go back to PB 2017 R3 and do a Git Push and get an error 'Git client error code: Generic error.' I've look thru the appeon developer community and didn't see anything that would help me. Do you have suggestion on how to correct this?<br />Anonymoushttps://www.blogger.com/profile/03642334386678191294noreply@blogger.comtag:blogger.com,1999:blog-14934996.post-76358018948955174382019-01-09T14:43:15.629-08:002019-01-09T14:43:15.629-08:00Hi Bruce, first-timer here, great how-to. I have a...Hi Bruce, first-timer here, great how-to. I have a more basic initial problem, which can be found at the below sub-heading:<br /><br />That will bring up the "Add to Source Control" dialog, from which we can select Git.<br /><br /><br />After setting up GIT, there is no 'Git' option in the 'Add to Source Control' interface dropdown. From recent experience trying to get TFS/Vis Studio option to show up in that dropdown, our system guy had to reinstall Vis STudio (i.e. the 3rd party tool, not Powerbuilder) with the right drivers selected to get TFS to finally show up in the dropdown. I'm thinking that GIT has to have the same thing somehow, can you fill us in on what it takes to get that Git option to show up there? Thanks.jtdev101https://www.blogger.com/profile/16723438871363152254noreply@blogger.comtag:blogger.com,1999:blog-14934996.post-70189514415281410682018-04-24T13:37:42.238-07:002018-04-24T13:37:42.238-07:00Hi Bruce, there is a question i have:
Let's i...Hi Bruce, there is a question i have:<br /><br />Let's imagine the following scenario:<br /><br />1. I create a new branch (feature_X) and switch to the develop branch.<br /><br />2. I make a change ... git notices that two files have changed:<br />Once the x2.pbl file and once the source file from ws_objects. I commit this change.<br /><br />3. I switch back to the develop branch. There I make a change in the same place and elsewhere ... git notices again that two files have changed. the x2.pbl and the source file located in ws_objects.<br /><br />Now, the changes from feature_X branch to merge into the develop branch. As expected, we get a merge conflict. There are two files in conflict:<br /><br />1. the x2.pbl and 2. the source file (from ws_objects).<br /><br />the source file can be merged after a manually adjust, but how do I deal with the x2.pbl? Since this is a binary file I can either choose between the x2.pbl from the develop branch or the x2.pbl from feature_X.<br /><br />If I select the x2.pbl from feature_X, the changes I made later in develop are gone. If I select the x2.pbl from develop, the changes from the feature_x branch will be lost.<br /><br />what am I doing wrong here? Surely there is a possibility that I will regenerate the .pbl after I have adapted the source file from the ws_object folder? Should not this happen automatically?<br /><br />How do I get Powerbuilder configured to regenerate the x2.pbl as soon as the source file is changed from ws_objects?<br /><br />BTW: i am using source tree to work with branches,SroPagehttps://www.blogger.com/profile/04941567726099593405noreply@blogger.com