We have a bit if a disconnect in the project about what and when to squash and no clear policy.
IM(NS)HO all commits should be squashed unless they make a working Geany, which means most merges can simply squash all commits with github and maybe clean up the message (remove the "fix up foo" type commit messages). In others opinions commits should be merged to make a buildable Geany. And others have the erroneous idea that they should be squashed to make logical change sets which may leave Geany broken, or even unbuildable. Sadly there has been too much of this over the Geany history and now Git bisect is pretty much useless over much of the history, but that should not be an excuse to continue to break it by not squashing commits that do not at least make a valid build. [end rant] In your case my quick glance says the four commits are a basic one and three fixups, IMO so the whole lot could be squashed and merged by github's big green button. But for people like @b4n who (IIUC) still insist on doing their Git from the command line, the squash and merge is of course more work, which is probably why he asked you to do it. IMO old fashioned approaches like that just add extra barriers to contribution which we don't need. -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3355#issuecomment-1386606670 You are receiving this because you are subscribed to this thread. Message ID: <geany/geany/pull/3355/[email protected]>
