Git Repo & Local Main branch: Need to Reconcile

[Apple]

@GraybeardCoder

I also don't want my local public/videos folder to be deleted since it no longer exists in the remote repo.

If it's in .gitignore it'll be ignored, meaning it won't be deleted, this can be seen in the staging area - the files don't appear in the staging area because they're ignored

@GraybeardCoder

Suggestions?

@Apple

I always recommend using a proper Git client to solve conflicts and other complications. Git clients will always be more “battle-tested” when it comes to solving problems than Wappler’s built-in Git client

I use:

Fork - a fast and friendly git client for Mac and Windows