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

Resolved PB2019R3, GIT and DevOps

  1. How-to
0
Votes
Undo
  1. Connie Dove
    Connie Dove
  2. PowerBuilder
  3. Thursday, 21 April 2022 15:30 PM UTC

We have just upgraded our applications from PB10 to PB2019R3 and was successfully able to get them loaded into Azure DevOps for source control.  Now we are running into issues when we need to make a change to the applications.  We only have 2 PB developers and each have their own applications.  We are both new to GIT.  Our agency is using Git and DevOps with our Visual Studio .Net applications and now our manager wants us to get our Powerbuilder code into source control following the same format as out other applications.

The developer will pull down the code to their local machine from DevOps.  They will create a new branch for the changes.  They will make the changes needed.  They will then commit the changes.  They will then push their branch up to DevOps.  Then they have to do a pull request to move the changes from their branch to our QA branch.  When they go to do this, they always get merge confilts, saying that the changes have been made in both.  Usually one of those conflicts is the project file and the other is the windows or datawindows worked on.  

Has anyone put together cheat sheets of working in this type of environment.  I watched the videos from the Elevates and that is how I was able to get out code into the Repos in DevOps.  

Or any guidance anyone can provide?  

Thank

SQL 2019 connection in citrix environment
Default Printer behavior change from 2017 to 2017R...
Responses (2)
Connie Dove
Connie Dove Accepted Answer Pending Moderation
  1. Friday, 22 April 2022 15:41 PM UTC
  2. PowerBuilder
  3. # 1

That might can work.  But in this case this is the same developer that made the changes, did the pull request to QA.  Then had to make additional changes, did another pull request to QA and that is when she is getting the merge conflicts.   

Comment
Tom Jiang @Appeon
  1. Tom Jiang @Appeon
  2. Monday, 25 April 2022 01:50 AM UTC
I suggest that you install TortoiseGit and then in Windows Explorer's context menu you can go to TortoiseGit > Show Log to see the details of each commit. This may help you identify where the conflict comes from and how to avoid it.

  1. Helpful
There are no comments made yet.
Tom Jiang @Appeon
Tom Jiang @Appeon Accepted Answer Pending Moderation
  1. Friday, 22 April 2022 09:11 AM UTC
  2. PowerBuilder
  3. # 2

How about setting up a Dev repository so that the two developers can sync their code before pushing it to QA? If each of them sync their code in Dev before pushing it to QA, there should not be any conflict. 

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.
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.