Murmele/Gittyup

Allow configuring merge type

Open

#423 opened on Jan 11, 2023

View on GitHub
 (1 comment) (1 reaction) (0 assignees)C++ (167 forks)auto 404
enhancementgood first issue

Repository metrics

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

Description

When I join one branch to another, it seems to default to joining with fast forward. If I want to join without fast forward, I must select it from the list every time I want to join branches.

It would be nice if it can be configured globally and per repository.

Contributor guide

Research direction
Explore how merge actions are currently performed in the codebase, and how settings/preferences are stored and exposed in the UI. Look for existing patterns for per repository settings to implement a global and per repo merge type option.
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.
3
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
Half day
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Active
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.
70