search

ProjectBorealis / PBSync

System for syncing Unreal Engine project git repositories
MIT License
79 stars 8 forks source link

Applying autostash resulted in conflicts #19

Closed mastercoms closed 1 year ago

mastercoms commented 3 years ago

We don't handle this very gracefully. We should pop the stash, and let users resolve it in editor.

mastercoms commented 1 year ago 
$ git status
On branch promoted
Your branch and 'origin/promoted' refer to different commits.
  (use "git status --ahead-behind" for details)

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
        both modified:

image

exit code 128