Bug 7348

GIT and conflict on PULL - can I have more informations in the error message, please? 15 October, 2021

Ludwin Feiten
06 October, 2021
Product: PowerBuilder Category: IDE
Version: 2019 R3 Build: 2703
Classification: Publishing: Public
Priority: P3
Status: Analyzing Reason:
Communication Status: Waiting for Appeon
Ludwin Feiten 15 October, 2021
#3 
Hi Chris,
that wasn't my point.  
I wanted " ... a little more information about the conflicting objects ...". 
The reason: How will I know wish off all the objects are the conflicting ones. 
(Instead I get: There is an error, Good luck finding it)

My colleagues already switched completely away from PB's integration of GIT. 
They use "fork" for every thing. That's much more comfortable. PB's GIT integration is just good enough for a "refresh" on the PBLs.

But I wanted to stay with PB and help to improve it.
Chris Pollach @Appeon 06 October, 2021
#2 
Hi Ludwin;

  The key thing to remember here is whenever you get a "conflict" message in the PB IDE, the only way to proceed is to use the GIT Client to resolve the conflict. This is stated in the PB Help. The IDE cannot handle / resolve conflict situations.

HTH
Regards ... Chris
Ludwin Feiten 06 October, 2021
#1 
GIT - more information please.png (6KB)

*Phenomenon:
I use GIT and I issued a PULL.
Two objects had conflicts and prevented the checkout.
That's what I get in the Error-Window.
But what I miss is a little more information about the conflicting objects in the error message. Maybe the name and the PBL would be great.
And there where also no red exclamation mark in the system tree :-( 

*Reproduce Steps:
Make a colleague to push changed objects
Make changes on that objects in your workspace 
Issue a pull on GIT

Remarks:
OS:
Windows 10
Platform:
32-bit
Database Type:
Database Version: