SCENARIO: Rubrics may include several numerical and alphabetical segm…

[saurL]

We, Ilona gayda, Halley Louisand Lucas, hereby grant to Hyperglosae maintainers the right to publish our contribution under the terms of any licenses the Free Software Foundation classifies as Free Software Licenses.

[benel]

Thank you for this scenario @saurL (and anonymous contributors).

Please don't forget to fill the copyright agreement with your three names.

Please also amend your commit so that your 2 other colleagues get credited for their contribution (e.g. the Co-authored-by syntax is meant for commits and not for pull request messages).

Regards.

[benel]

@saurL @ilonagayda It seems that you have troubles with Git...

1. I suggest also that you create a backup branch pointing to your last commit in case something would go wrong (git branch backup).
2. Then, I suggest you to do the next section level in LearnGitBranching named "Déplacer le travail" in order to learn "interactive git rebase".
3. Is there anyone in your team that could help you with interactive rebase? If not, do you want me to help you?

[benel]

Thank you for your contribution @saurL and @ilonagayda.

Please note that your Git history must be cleaned up before being integrated.

Whereas your syntax edits might appear to you as a good idea, they are not: adding unrelated lines in a commit :

• prevents the Git history to be used as a developper documentation (both from a file – with the blame feature – or from the commit graph),
• generates a lot of "false" edition conflicts.

So please:

1. "squash" all your implementation commits into a single one (called FIX: Rubrics may include several numerical and alphabetical segments (fixes #253).).
2. With a git visual client (allowing to add or remove code lines in a commit), remove any unrelated lines.
3. When everything is OK on your laptop, force push your branch.

If you need help, just ask.

Regards.

[benel]

@saurL @Odyrac
Thank you @ilonagayda.

It seems that you dropped the commit structure. You should have two different commits: one for the SCENARIO, the other for the FIX, and each one should indicate the second and the third author.

Please have a look of what your colleagues (@kejaulin, @Lazizzze and @lfcm64) did for the other fix:

• 4bfe02f
• ef4fa24

They can probably help you too if needed. I can also. Just ask.