1. Gimmy Susan
  2. PowerBuilder
  3. Thursday, 14 June 2018 10:36 AM UTC

Good morning

I have a strangeness in PB.


Let's build the case:

1)
The folder submitted to git in a clean state.
I type 'git status'.
the system answers me:
"nothing to commit, working tree clean"
Very well.

2)
I open PB and do a 'pull' to see if any changes have been made.
PB replies:
"------------ source control"
"Git client is pulling workspace.Please wait ..."
"Git pull success."
"Git pull"
"-------- Done Source Control"
There was nothing to download


3)
I go into the folder submitted to git
enter 'git status'
the system responds:
"All conflicts fixed but you are still merging."
"(use" git commit "to conclude merge)"


Why?
If I try to commit and push, the system creates a commit point with no sources in the remote repository.


Any contribution is welcome

Accepted Answer
Gimmy Susan Accepted Answer Pending Moderation
  1. Friday, 17 April 2020 14:49 PM UTC
  2. PowerBuilder
  3. # Permalink

resolved

Comment
  1. Armeen Mazda @Appeon
  2. Friday, 17 April 2020 15:41 PM UTC
What was the solution?
  1. Helpful
  1. Gimmy Susan
  2. Friday, 17 April 2020 16:44 PM UTC
Pb 2017r3
  1. Helpful
There are no comments made yet.
David Edison Accepted Answer Pending Moderation
  1. Friday, 15 June 2018 01:08 AM UTC
  2. PowerBuilder
  3. # 1

Hi Gimmy,

Thanks for reporting the issue. We are working on fixing this issue with incorrect commit history. 

Regards,

Tom Jiang

Comment
There are no comments made yet.
Govinda Lopez @Appeon Accepted Answer Pending Moderation
  1. Thursday, 14 June 2018 13:37 PM UTC
  2. PowerBuilder
  3. # 2

Hi Gimmy,

 

Please try the same process twice. Do let us know if this worked.

 

Regards,

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.