[BSERV-4617] Resolve Merge Conflicts from the UI - Create and track feature requests for Atlassian products.

XML

Word

Printable

Details

Type: Suggestion
Status: Gathering Interest (View Workflow)
Resolution: Unresolved
Fix Version/s: None
Component/s: Pull Request - Merge, Pull Requests
Labels:
- git
- iw
- merge-conflicts

UIS:
9
Feedback Policy:

We collect Bitbucket feedback from various sources, and we evaluate what we've collected when planning our product roadmap. To understand how this piece of feedback will be reviewed, see our Implementation of New Features Policy.

Description

When moving through pull requests and a merge conflict comes up sometimes it is just a matter of resolving everything to the newer version. i would be nice to have this option from the GUI, or to be able to edit simple conflicts.

Attachments

Issue Links

is duplicated by

BSERV-11855 Improvement of Diff in Pull Requests

Closed

BSERV-12702 Ability to resolve conflicts in the browser

Closed

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

Activity

People

Assignee:: Unassigned

Reporter:: AJ DaNelz

Votes:: 73 Vote for this issue

Watchers:: 19 Start watching this issue

Dates

Created:: 16/Apr/2014 6:25 PM

Updated:: 05/Nov/2021 3:46 AM