search

FAU-CS6 / KDD

Lecture and exercise of "Knowledge Discovery in Databases"
GNU General Public License v3.0
22 stars 11 forks source link

Revert "lecture-3: fixed a typo on page 14" #52

Closed dominik-probst closed 2 years ago

dominik-probst commented 2 years ago

Reverts FAU-CS6/KDD#47

Two main reasons:

1) The merge of the merged PR #47 into the main branch did result in the CI of the main branch failing 2) The squash merge into main included many, many commits not linked to this PR. PR #47 should have been merged into dev not into main.

dominik-probst commented 2 years ago

@melsigl It seems like the original PR was targeted at the main branch instead of the dev branch. Due to the fact that the PR used some commits that are only present at the dev branch at the moment, it also merged these additional commits into the main branch. We have to validate whether PRs are targeted towards the dev branch to avoid this.

Regarding the single commit in the PR: We already have a statement in the Contributing.md regarding that part. I guess that the student didn't see that due to the fact that the Contributing.md is only present at the dev branch at the moment.

Regarding the versions: That is something that we definitly should do. I will take a look into this the next time I start working on the repo.

melsigl commented 2 years ago

As far as I can remember the original PR did indeed only include a single commit. Simply rebasing a commit does not automatically include more commits, nor does it automatically merge other commits. There is no explicit merge commit present. However, when you keep your feature branch up do date with your upstream, these commits are attributed to a previously opened PR. It seems that this happened here. That is not considered a "merge" then, though.

Contributing: We now have an explicit line stating exactly this, which we previously did not have. CONTRIBUTING.md merely mentioned merge commits. Yet, here we do not have a merge commit.