Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge line is marked as dashed instead of solid #747

Open
gsardiscot4u opened this issue Apr 23, 2024 · 0 comments
Open

Merge line is marked as dashed instead of solid #747

gsardiscot4u opened this issue Apr 23, 2024 · 0 comments

Comments

@gsardiscot4u
Copy link

gsardiscot4u commented Apr 23, 2024

I'm experiencing a minor graphic glitch in the rendering of the merge line when I switch to the branch preceding the merge.
This glitch appears when I have uncommitted files in my working directory (which can also be untracked).
I use Gittyup v1.3.0 - 2023-04-20 on Windows 11 Pro.

As-is:
Screenshot 2024-04-23 174504

Expected behavior:
fixed

Step to reproduce:

  1. Create a repository and make the first commit:
git init
touch file1
git add file1
git commit -m "Add file1"
  1. Create a new branch named 'feature' and commit in it:
git checkout -b feature
touch file2
git add file2
git commit -m "Add file2"
  1. Optionally, add some commits to the 'master' branch to highlight the issue:
git checkout master
touch.exe file3
git add file3
git commit -m "Add file3"
touch file4
git add file4 4
git commit -m "Add file4"
  1. Merge the 'feature' branch into 'master' (the '--no-ff' option is mandatory if step 3 was not performed):
git merge feature --no-ff

image

  1. Switch back to the 'feature' branch and add a file:
git checkout feature
touch file5

It's not evident to see the merge when looking at the lines.
image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant