Murmele/Gittyup

Option to replace "ours" and "theirs" button tags

Open

#527 opened on Apr 19, 2023

View on GitHub
 (0 comments) (0 reactions) (0 assignees)C++ (167 forks)auto 404
enhancementgood first issue

Repository metrics

Stars
 (2,245 stars)
PR merge metrics
 (PR metrics pending)

Description

I've always find "ours" and theirs tags very unclear,

i think it will be a good idea have the option "merge conflict branch name button"

for example a button like

take this from____________take this from "master"__________________"develop"

with a button name modified dynamically

Contributor guide

Research direction
Start by searching the codebase for the 'ours' and 'theirs' button labels. Identify the merge conflict resolution view and trace how branch names are accessed. Then propose a way to replace the static labels with dynamic branch names.
Tech stack
cpp
Domain
desktop
Issue type
Feature
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
2
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
1-3 hours
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Fresh
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
Clear
Prerequisites
GitC++
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
75