Subscribe via RSS
Toggle Submenu
  1. Categories
  2. Recent
  3. Tags
View Replies (2)

Resolved PB 2017 R2 Git question

  1. How-to
0
Votes
Undo
  1. Ashutosh Varshney
    Ashutosh Varshney
  2. PowerBuilder
  3. Friday, 16 July 2021 14:28 PM UTC

Hello everyone.

I am following this excellent article by Bruce - https://community.appeon.com/index.php/articles-blogs/tutorials-articles/2-powerbuilder/183-powerbuilder-2017-r2-new-feature-git-source-control-support

How do I find differences between my local repo and the master and also how to merge changes? I am using PB 2017 R2 1796. 

Thank You.

 

Failed to publish PowerClient app
Orcascript PB2019R3
Accepted Answer
Armeen Mazda @Appeon
Armeen Mazda @Appeon Accepted Answer Pending Moderation
  1. Friday, 16 July 2021 16:07 PM UTC
  2. PowerBuilder
  3. # Permalink

Merging you need to do using the Tortoise Git client... you cannot do a merge inside the PB IDE.

As far as working with branches, you need to upgrade to PB 2019 R3.  This and many other Git features supported in PB 2019 R3: https://docs.appeon.com/pb2019r3/whats_new/Source_control_enhancements.html

Comment
There are no comments made yet.
Responses (2)
Ashutosh Varshney
Ashutosh Varshney Accepted Answer Pending Moderation
  1. Friday, 16 July 2021 16:26 PM UTC
  2. PowerBuilder
  3. # 1

Thanks Armeen.

PowerBuilder did merge my code when I pulled from git like Bruce mentioned. 

Comment
Armeen Mazda @Appeon
  1. Armeen Mazda @Appeon
  2. Friday, 16 July 2021 16:27 PM UTC
Yes, but when you are merging sometimes there are conflicts. You need to resolve that outside of PB IDE.
  1. Helpful
Ashutosh Varshney
  1. Ashutosh Varshney
  2. Friday, 16 July 2021 16:31 PM UTC
Got it. Thanks Armeen.
  1. Helpful
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.