Altinn / Altinn/altinn-studio

In conflict window, add an option for creating a branch with current changes

Open
#17,527 0 comments 0 reactions 0 assignees View on GitHub
area/version-control
Dominant language
C#
Stars
169
Forks
100
Avg merge
1d 5h
Merged PRs (30d)
272

Description

## Description
In the conflict screen, we currently have options for saving changes to a zip file. We could add another option for saving the changes to a new branch, so that service owners can merge changes in Gitea or locally.

Image
Here we can add another option "Jeg vil ha en ny gren med mine endrede filer".

Contributor guide

Open the contributing guide

Research direction

The issue names the conflict screen and its existing option for saving changes to a ZIP, but no files, tests, or entry points. Start by locating the conflict-screen implementation and the current ZIP-save flow. Done means a new option creates a branch containing the current changes and supports the described merge workflow.

Written by the indexing model from the issue text.

Assessment

Tech stack
git
Domain
developer-experience
Issue type
Feature
Difficulty
4/5
Estimated time
3-5 days
Activity status
Stale
Clarity
Mostly clear
Newbie friendliness
35/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.