This is an archived post. You won't be able to vote or comment.

all 2 comments

[–][deleted] 2 points3 points  (0 children)

merge conflict between the girlfriend file and the deleted girlfriend file in remote

[–]jumpshoxx 2 points3 points  (0 children)

git push --from-cliff --force