jesseduffield / jesseduffield/lazygit

The closing boundary is always removed automatically after resolve conflict

Open
#2,254 5 comments 0 reactions 0 assignees View on GitHub
bug
Dominant language
Go
Stars
82.4k
Forks
3k
Avg merge
2d 18h
Merged PRs (30d)
19

Description

**Describe the bug**
The closing boundary is always removed automatically after resolve conflict

**To Reproduce**
Steps to reproduce the behavior:

1. Given there is a new branch with conflict with master
2. When rebase this new on master
3. Then resolve the conflict

**Expected behavior**
The closing boundary is still kept after resolve conflicts.

**Actual behavior**
The closing boundary is removed after resolve conflicts.
![ClosingBoundary](https://user-images.githubusercontent.com/52661397/200812351-0b99b169-18e8-4c47-a5e9-3c39873cf88d.png)

**Version info:**
lazygit verison 0.35
git version 2.34.1

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.