Skip to content

Git workflow #25

@xaur

Description

@xaur

Initially it was: commit as it goes and squash some.

Currently it is: minimize master commits count but keep individual contributions as separate commits. Right now it yields 3-5 commits per issue. Commits before rebase are saved in "archive/before-big-rebase" branch.

To consider: one commit per issue. After the issue is released intermediate states are not really interesting (unlike code). The only problem is exact contributions (patches) are lost.

Options to preserve contributions:

  • State in the article (as done currently)
  • Use Co-authored-by (GitHub specific?)
  • Preserve commits in merged branches
  • Preserve commits in master (current)

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