- François Rossignol
- PowerBuilder
- Wednesday, 23 October 2019 11:57 AM UTC
HI,
since yesterday we're trying to use github for versionning control with our PB 2017 R3 application.
github account are not entreprise accounts but we're planning on going there once things go smouthly
We enever used git before, knowledge of git is really minimal.
The setup
Existing PB app and workspace.
Sent to github (user1) with add to source control
Repo is private
githuib account user2 added as collaborator for the private repo.
user2 did a connect to workspace to get the workspace on his local PC.
Issue #1:
user2 can't commit existsing objects with the GIT Commit Menu in PB
user1 can commit the same objects with the GIT commit Menu in PB
user2 can commit those objects with TortoiseGit
user2 can commit objects he newly created
Issue #2:
We're getting "Git client error code: Checkout conflicts prevented operation." errors on a regular basis.
Ususally after a rebuild.
With that we can't pull or push anymore from PB.
We need to stack changed to "repair" it
Problems (seems to) comes from conflict in pbl files.
Tried to add *.pbl *.pbd to the .gitignore file but no luck.
Is there a correct way to setup/configure to avoid any conflicts on the pbl files ?
Thanks in advance.
Regards,
François
Find Questions by Tag
Helpful?
If a reply or comment is helpful for you, please don’t hesitate to click the Helpful button. This action is further confirmation of their invaluable contribution to the Appeon Community.