search

DickinsonCollege / FD2School-FarmData2-S23

A fork of FarmData2 that is used for the FarmData2 School Activities.
Other
1 stars 36 forks source link

Test Seeding Report Tray Seeding Summary Values #234

Open Mikek16 opened 1 year ago

Mikek16 commented 1 year ago

Pull Request Description Closes #207

--- __Licensing Certification__ FarmData2 is a [Free Cultural Work](https://freedomdefined.org/Definition) and all accepted contributions are licensed as described in the LICENSE.md file. This requires that the contributor holds the rights to do so. By submitting this pull request __I certify that I satisfy the terms of the [Developer Certificate of Origin](https://developercertificate.org/)__ for its contents.
Mikek16 commented 1 year ago

@braughtg This feature branch still contains old commits from previous features. Is there a way i can rebase this feature branch with main to remove these commits before closing the pull request?

braughtg commented 1 year ago

This feature branch still contains old commits from previous features. Is there a way i can rebase this feature branch with main to remove these commits before closing the pull request?

This typically happens when your work is based off of another feature branch. When you merge the upstream main into your branch - which it looks like you did - the changes shown in the "Files changed" tab should then just show your new changes. For some reason, GitHub still shows the old commits. This just seems to be a quirk of the way git / GitHub work.

As long as the "Files changed" tab just shows the new changes it will be fine when it is merged intomain because the changes from those other commits are already there.

braughtg commented 1 year ago

If or when this is ready, just mark it as "Ready for review" and I'll look it over again in detail.