You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
The idea basically is to minimize the number of merge commits in our GitDoc powered knowledge base by first attempting the pulling of changes with git pull --rebase. In case of conflicts, the rebase could be aborted with git rebase --abort and we could fall back on existing behavior and that's fine. But for the times when the team has simultaneously contributed to different articles, this would give a cleaner history of the whole repo.
Similarly, an automatic git stash, git stash pop around the pull could provide a smoother, more automated experience when syncing comes to a halt during the day because of conflicts. Files with unresolved conflicts should obviously not be pushed but they would become automatically visible in VSCode source control making them easier to react to.