1. Toan Nguyen
  2. Beta Testing
  3. Friday, 14 February 2020 15:07 PM UTC

Hello All,
 
I am attempting to do GIT Pulls and GIT Pushes to get githlab in the PB IDE. It 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 can do Git Revert, Git Resolve, Refresh and Upload PBL in the PB IDE.

So, I can only and do PUSH and PULL using either Git Bash or TortoiseGit.


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


I am using PB2017 R2 build #1769.


Any assistance would be greatly appreciated.


Thanks,

Toan Nguyen

 

Tom Jiang @Appeon Accepted Answer Pending Moderation
  1. Saturday, 15 February 2020 04:49 AM UTC
  2. Beta Testing
  3. # 1
0
Votes
Undo

Hi Toan,

It's probably because someone has uploaded/committed some PBL(s). PB IDE cannot handle binary conflict. In this case, you can only use Git Bash or TortoiseGit to pull and resolve the conflict.

Regards,

Tom Jiang 

Comment
There are no comments made yet.
Chris Pollach @Appeon Accepted Answer Pending Moderation
  1. Friday, 14 February 2020 19:27 PM UTC
  2. Beta Testing
  3. # 2
0
Votes
Undo

Hi Toan;

   FWIW: There were fixes and updates to the GIT and SVN processing in the later PB2017R3 release and then again in the latest Maintenance Release (MR). The current R3 build is 1915. You might want to try and update your PB20917 IDE and then retry this GIT process again.

  Note: PB2017Rx and PB2019 can only deal with one "Main" GIT Branch. PB2019 R2 release coming out later this year will be able to handle sub-branches.

Regards ... Chris

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.