redzadow
Newbie
- May 18, 2017
- 88
- 84
I made my own temporary fix to strip_clip_foreclosed.rpy on the test branch. I'm now getting the following warning when updating.
Does anybody know? Thanks.
What command do I used to trash my changes and grab the official? I believe "git restore --staged game/plotlines/StripClub/strip_club_foreclosed.rpy" will fix me up, but I want to make absolutely sure I'm not gonna fuck up everybody's hard work and update the branch.Unmerged paths:
(use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: game/plotlines/StripClub/strip_club_foreclosed.rpy
Does anybody know? Thanks.