• Type: Bug
• Resolution: Fixed
• Priority: Low
• Fix Version/s: 5.0.0
• Affects Version/s: 4.14.1
• Component/s: None
• Labels:

  None

1. 

   Screen Shot 2017-02-28 at 17.16.02.png

   36 kB

   02/Mar/2017 1:17 PM

2. 

   Screen Shot 2017-02-28 at 17.14.10.png

   77 kB

   02/Mar/2017 1:17 PM

[BSERV-9614] Merge instructions for Fork Pull Request merge conflicts have .undefined in git repository URL

Owen made changes - 10/Apr/2019 6:47 AM

Workflow

Original: Stash Workflow - Restricted [ 1765061 ]

New: JAC Bug Workflow v3 [ 3136943 ]

Owen made changes - 24/Oct/2018 5:27 AM

Symptom Severity

Original: Minor [ 14432 ]

New: Severity 3 - Minor [ 15832 ]

Daniele Carcasole (Inactive) made changes - 15/Mar/2017 11:41 PM

Affects Version/s

New: 4.14.1 [ 66793 ]

Daniele Carcasole (Inactive) made changes - 15/Mar/2017 11:40 PM

Fix Version/s		New: 5.0.0 [ 66696 ]
Resolution		New: Fixed [ 1 ]
Status	Original: Needs Triage [ 10030 ]	New: Closed [ 6 ]

Daniele Carcasole (Inactive) made changes - 02/Mar/2017 1:31 PM

Assignee

New: Daniele Carcasole [ dcarcasole ]

Daniele Carcasole (Inactive) made changes - 02/Mar/2017 1:30 PM

Description

New: h3. Summary When trying to merge a forked repository back to the original repository, if a conflict is detected, the instructions given for the merge are incorrect. h3. Steps to Reproduce # Fork a repository. # Make changes to one file in the original repository after the fork. # Make changes on the same file on the forked repository in order to create a conflict. # Create a PR to merge back the Fork with the original repository # After the PR gets created a warning panel shows the presence of a conflict and offers more information on how to solve the conflict. !Screen Shot 2017-02-28 at 17.16.02.png|thumbnail! h3. Expected Results The instructions show the correct steps to merge after the conflict is removed. h3. Actual Results The instructions shown have an incorrect repository URL showed where the expected {{.git}} URL is shown as {{.undefined}}  !Screen Shot 2017-02-28 at 17.14.10.png|thumbnail! h3.Workaround Apart from the repository URL, the instructions are still valid. Execute the instructions being sure to replace {{.undefined}} with {{.git}}

Daniele Carcasole (Inactive) made changes - 02/Mar/2017 1:17 PM

Attachment		New: Screen Shot 2017-02-28 at 17.14.10.png [ 223083 ]
Attachment		New: Screen Shot 2017-02-28 at 17.16.02.png [ 223084 ]

Daniele Carcasole (Inactive) created issue - 02/Mar/2017 1:10 PM