1. Michael Skinner
  2. PowerBuilder
  3. Wednesday, 2 October 2019 15:04 PM UTC

 

Hello All,

 

I am attempting to do a Pulls and Pushes to get github in my company. I does not work.

For the PUSH i see:

Git client error code: Reference was not fast-forwardable.

For the PULL  I see:

Git client error code: Checkout conflicts prevented operation.

I have attempted to "Refresh" and 'Resolve' and nothing.

I am using PB2017 R3 and i have also tried this in PB2019 - same result. The source code was migrated from TFS so we can have all of the history.

Also, I tried to create a Private Repository - same results.

Any assistance would be appreciated,

Thanks

 

 

 

 

 

 

 

 

Michael Kramer Accepted Answer Pending Moderation
  1. Thursday, 3 October 2019 00:15 AM UTC
  2. PowerBuilder
  3. # 1

Hi, how did you connect your PB workspace to your GitHub repo?

I've seen similar issues caused by git repo's config or file placements for PBW and other PB files. File/folder placement is completely different than for traditional source control integration.

There are basically two ways using the native git integration:

  1. You have existing PB workspace locally. Here you populate the "remote" git repo from your PB workspace
    1. Choose from workspace Add to Source Control.
    2. Select git
    3. Let PB IDE create internal git repo containing all files within the workspace root folder
    4. Using workspace properties establish connection to GitHub Enterprise
  2. You have existing git repo containing PB files
    1. Close any existing workspace
    2. In empty system tree select CONNECT to workspace
    3. Select git
    4. Enter remaining repo/project/user details
    5. Click [OK]
    6. PB IDE now creates internal git repo by clone or pull (don't remember which)

PB has some requirements on where PBW file needs to be located and where PB source files will be stored.

Start by creating a tiny sample app. App object + a couple of windows/NVOs + couple DataWindows. Spread PB objects across 2 PBL files in same folder (perhaps third PBL in a different folder) to simulate "large app".

Then try OPTION 1 above and investigate how that repo looks. This teaches you how PB wants to organize the source files in a git repo.

Then try OPTION 2 from a different folder on your DEV machine. This teaches you how PB creates its local copy from the remote git repo.

You may find F1-Help docs on git integration. Also articles & videos on Appeon's main site or community site. There may be video from conference presentations going through the same options as above.

I still recommend learning from tiny example to understand what happens. The handling of source files is markedly different for git than for the traditional TFS (MSSCCI) version control integration.

HTH /Michael

Comment
There are no comments made yet.
  • Page :
  • 1


There are no replies made for this question yet.
However, you are not allowed to reply to this question.
We use cookies which are necessary for the proper functioning of our websites. We also use cookies to analyze our traffic, improve your experience and provide social media features. If you continue to use this site, you consent to our use of cookies.