Skip to content

[Feature Request] Option to pull with --rebase when possible for a cleaner history #75

@wtflm

Description

@wtflm

My team would be interested in a pull strategy explained in this short video despite the clickbaity title: https://www.youtube.com/watch?v=xN1-2p06Urc

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.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions