1. Vipin Dwivedi
  2. PowerBuilder
  3. Friday, 25 May 2018 15:57 PM UTC

Hello PB Experts,

Whenever I use Git pull in PB2017, it pulls nothing if my local master is same as Origin master but this creates Merge_Head file in .git folder. After hitting Git pull, whenever I go to SourceTree and hit the Pull from there, it always says "you have not concluded Merge_Head. Please commit" but there is no change in any files. I have to manually delete the merge_head file to run the SourceTree correctly. Is something wrong in Git pull method in PB2017? What is the best approach.

FYI - We are using SourceTree as our PB2017 application is connected to my fork repository. Any changes I made, it goes to my fork area. We use the pull request to push our changes to main repository (upstream) using SourceTree. To download other developers changes, we use pull from Main repository (upstream) to our local repository and then push from my local repository to my fork repository to make a sync between my local repository to fork repository. 

I am still learning these concept.

Thanks,

Vipin.

Accepted Answer
Tom Jiang @Appeon Accepted Answer Pending Moderation
  1. Monday, 28 May 2018 09:51 AM UTC
  2. PowerBuilder
  3. # Permalink

Hi Vipin,

Currently, PowerBuilder native Git has this issue, where it creates an uncompleted merge state. This issue is fixed and will be available in 2017 R3.

Regards,

Tom Jiang

Comment
  1. Vipin Dwivedi
  2. Tuesday, 29 May 2018 18:38 PM UTC
Thanks Tom for the reply. We will wait for 2017 R3.



Regards,



Vipin

  1. Helpful
There are no comments made yet.


There are replies in this question but you are not allowed to view the replies from this question.