gitbutler
gitbutler copied to clipboard
Can't discard file if it's locked
Problem:
- I changed file A, and this file was changed on the branch A.
- I committed this branch and pushed the commit.
- I create another branch B (default branch) and start work on another things. But then I changed file A again and changes for this file appeared on both branches A and B
The problem is that I wanted to have changes for this file either on a default branch B and then move it to another branch I want, or it appeared on the branch A if it's locked to this branch
How I tried to solve the issue 5. I tried to move file A from the branch B to A — no luck 6. I tried to discard changes for file A on the branch B — no luck
I attached a short video:
https://github.com/gitbutlerapp/gitbutler/assets/18498712/5c3b747e-df83-4fe4-87ad-21fd3bb86849