Loading...

XML

Word

Printable

Details

Type: Bug
Resolution: Fixed
Priority: Medium
Fix Version/s: 3.5.0
Affects Version/s: 3.3.0
Component/s: Pull Request - Merge
Labels:

Bug Fix Policy:
View Atlassian Server bug fix policy

Description

When a PR is raised because there is a conflict on a cascading merge, the instructions tell you to merge the wrong way:

Attachments

Issue Links

is related to

BSERV-5443 Pull Request resolve conflict instructions are reversed when merging from release branch into feature branch

Closed

mentioned in: Page Loading...; Page Loading...; Page Loading...; Page Loading...; Page Loading...; Page Loading...

(2 mentioned in)

Activity

People

Assignee:: Unassigned

Reporter:: Brent P

Votes:: 1 Vote for this issue

Watchers:: 6 Start watching this issue

Dates

Created:: 12/Sep/2014 3:48 AM

Updated:: 19/Oct/2015 5:39 AM

Resolved:: 10/Nov/2014 7:29 AM