zf1s / zf1

Monorepo of a fork of Zend Framework 1, with all components split into individual composer packages. PHP 5.3-8.3 compatible.
BSD 3-Clause "New" or "Revised" License
57 stars 22 forks source link

Fix when the data is the same as stored #163

Closed fredericgboutin-yapla closed 1 year ago

fredericgboutin-yapla commented 1 year ago

From https://github.com/Shardj/zf1-future/commit/9175301058d324bcdcdca0d091b2e6c394273a95

glensc commented 1 year ago

ideally:

  1. the changes should be squashed to single commit by contributor
  2. as it's contribution by other person, it should be attributed: Co-Authored-By: Original Author <their@email.xx> in git trailer, or git commit --amend "Original Author their@email.xx" and Co-Authored-By the second author who made this commit
  3. the original author, the original pull request should be mentioned in pull request body.
  4. never create pull requests from your master branch.

but I guess it's ok as well if maintainers just use github squash merge option and fill the Co-Authored-By as git trailer manually in commit message.

glensc commented 1 year ago

@fredericgboutin-yapla you could also remove the two unwanted commits from your master and force push

git reset --hard eb369bf843c3c01385adde1c246daac7eccc2977
git push --force-with-lease
fredericgboutin-yapla commented 1 year ago

I'm grateful for your remarks. TBH this is literally the first time I'm contributing on a project like this. Is there anything I should've read first?

fredericgboutin-yapla commented 1 year ago

I started from scratch using Github Desktop - https://github.com/zf1s/zf1/pull/164

glensc commented 1 year ago

cross-link the PR's as well, saying in new pr body: Replaces <link to the old pr>

also worth to tag the username of original commit there as well: Originally submitted to zf1-future by @githubaccount

fredericgboutin-yapla commented 1 year ago

I'm struggling to find any original pull request or PR 😓

glensc commented 1 year ago

if you click on the commit it's the master (#23)

image