PB2017R2 & Git. - how to add yourself to a project

Resolved PB2017R2 & Git. - how to add yourself to a project

Issue

Votes

Undo

ATK Gimmy Susan
PowerBuilder
Wednesday, 30 May 2018 23:24 PM UTC

Hello to all.

I have a problem with PB2017R2 & Git.

Let's put the case:

- There is a project in the repositories and 10 programmers are working correctly.
- At this point I decide to involve another person (11th) in the project.
- I carry out a 'git clone' of the project on the new workstation.
(in our configuration we exclude the PBLs from the GIT management including '*.PBL' in the '.gitignore' file)
- at this point I copy the *.pbl from one of the programmers to the 11th person.
- The next step is to open the pbw and connect it to GIT.
Here the problem occurs.
PB regenerates all the objects in the library and exports them, overwriting those that came from the 'clone'.
In doing so I lost the correct sources ( from clone ) and overwritten them with a previous version ( pbl export ).

How can I solve the problem ?

It is impossible to align all staff and stop them until I added 11th.

Thanks for the reply.

Responses (2)

ATK Gimmy Susan Accepted Answer Pending Moderation

Thursday, 31 May 2018 08:39 AM UTC
PowerBuilder
# 1

Hi Jiang
Thanks for the reply, but the steps are not clear to me.
I read the PB manual in chapter 3.3.2, but I still have problems.

1) if I do as you say, PB asks me for login credentials. ( i already have the credential in control pannel / credential / web page )
If I try to login with uid and pwd that I use to login on the repositoty by web (my repository is on Visual Studio Team Services) the system answers me: 'Can not connect to the repository. Please make sure you have specified the correct URL repository, user ID and password'.

2) if the system connects and downloads the project, however, I miss the pbl.
What should be the steps to configure the 11th person client co-correctly?

thanks for your patience.

Gimmy

Comment

Load more comments

ATK Gimmy Susan
Friday, 1 June 2018 06:32 AM UTC

Hi Jiang

ty for your answer.

One question again.

If i have my pbl in sync With The remote repository i have Many conflict ( every sync)

if 2 users modify a different obj in The same library, i have a conflict.

how i resolve tris case?

ty 1k for your patience

Gmy

Helpful 0

David Edison
Wednesday, 6 June 2018 09:18 AM UTC

Hi Gmy,

The PBLs will be rebuild from source code in the ws_objects folder. So you can use a client like TortoiseGit to resolve all the PBL-related conflicts by accepting either the client side or server side PBL.

As to the conflict resulting from modifying different objects in the same PBL, this issue will be fixed in the R3 release, which will be available by the end of July if everything goes well. Currently, please use a Git tool to resolve the conflicts manually.

Regards,

Tom Jiang

Helpful 0

ATK Gimmy Susan
Wednesday, 6 June 2018 09:55 AM UTC

good news

Helpful 0

There are no comments made yet.

Tom Jiang @Appeon Accepted Answer Pending Moderation

Thursday, 31 May 2018 05:26 AM UTC
PowerBuilder
# 2

Hi,

You don't have to clone the repository. Just start PowerBuilder, close the open workspace, right click on the System Tree node, choose Connect to Workspace to initiate the local repository.

Regards,

Tom Jiang

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.

Please login to post a reply

You will need to be logged in to be able to post a reply. Login using the form on the right or register an account if you are new here. Register Here »

Forgot Password?

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.