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

CLAP 1.2.1 #405

Merged
merged 32 commits into from
May 4, 2024
Merged

CLAP 1.2.1 #405

merged 32 commits into from
May 4, 2024

Conversation

abique
Copy link
Contributor

@abique abique commented Apr 23, 2024

No description provided.

@baconpaul
Copy link
Collaborator

The content is fine with me, but can we clean up the git transactions a bit? Like, rebase/merge all those undo changes into a single commit in the log?

@abique
Copy link
Contributor Author

abique commented Apr 23, 2024

The content is fine with me, but can we clean up the git transactions a bit? Like, rebase/merge all those undo changes into a single commit in the log?

We'd loose the history if we squash, also the next branch is on the repo and we can't force push, so I'm not sure if it'll help.

I value the history because we keep a record of the thinking process and the various steps the extension went through. It may be useful one day for someone trying to understand why we've made an extension in a certain way.

It is still possible to read a squashed change set by making a diff between tags.

@baconpaul
Copy link
Collaborator

We don’t have to squash. We can partially rebase next to squash some of the interim commits with rebase -I and the do pick and fixup

Copy link
Contributor

@messmerd messmerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some suggestions - mostly typo fixes

@baconpaul
Copy link
Collaborator

Alex: I added info on rebasing on discord if that helps!

Copy link
Contributor

@defiantnerd defiantnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me. 2.0 ist much improved.

Copy link
Collaborator

@baconpaul baconpaul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I'm happy with this!

@abique abique merged commit f350abd into main May 4, 2024
7 checks passed
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

Successfully merging this pull request may close these issues.

5 participants