Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git workflow #25

Open
xaur opened this issue Jul 19, 2018 · 1 comment
Open

Git workflow #25

xaur opened this issue Jul 19, 2018 · 1 comment

Comments

@xaur
Copy link
Owner

xaur commented Jul 19, 2018

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)
@xaur
Copy link
Owner Author

xaur commented Nov 10, 2019

Git workflow has mostly stabilized but I'll keep this open until I do a few more planned things.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant