Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: enable code coverage. #5928

Merged
merged 1 commit into from
May 2, 2022
Merged

docs: enable code coverage. #5928

merged 1 commit into from
May 2, 2022

Conversation

datamweb
Copy link
Contributor

Explain about the activation coverage that is required to run the unit test.

tests/README.md Outdated Show resolved Hide resolved
@kenjis
Copy link
Member

kenjis commented Apr 29, 2022

@datamweb Thank you for updating.

In this PR, you have two commits, but one commit is enough for this change.
Why don't you squash?
See https://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git

tests/README.md Outdated Show resolved Hide resolved
@paulbalandan
Copy link
Member

We can just squash on merge.

@datamweb
Copy link
Contributor Author

@datamweb Thank you for updating.

In this PR, you have two commits, but one commit is enough for this change. Why don't you squash? See https://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git

@kenjis Thanks for the link. I think I did it.

@@ -295,6 +295,8 @@ the array's values are the values to save for that key:

.. literalinclude:: model/015.php

You can retrieve the last inserted row's primary key using the ``getInsertID()`` method.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenjis Thanks for the link. I think I did it.

Yes, you did it!

But this file change has nothing to do with this PR.
You squashed unrelated previous? commit?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!!!,I do not know why this change was applied.
Do I close this PR and open a new PR?

@kenjis
Copy link
Member

kenjis commented Apr 29, 2022

Try this:

$ git reset --hard HEAD^  # delete the last commit completely
$ git reset HEAD^  # cancel the last commit
$ git restore user_guide_src/source/models/model.rst  # remove the change of the file
$ git add tests/README.md
$ git commit

@datamweb
Copy link
Contributor Author

Try this:

$ git reset --hard HEAD^  # delete the last commit completely
$ git reset HEAD^  # cancel the last commit
$ git restore user_guide_src/source/models/model.rst  # remove the change of the file
$ git add tests/README.md
$ git commit

$ git commit [CodeCoverageEnable 7ec2bb603] Update from git 1 file changed, 1 insertion(+), 1 deletion(-)
but

error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

@kenjis
Copy link
Member

kenjis commented Apr 29, 2022

@datamweb Did you use git pull?

Try:

git reset --merge

@datamweb
Copy link
Contributor Author

I am using the desktop version of Github. I think that's why.

Screenshot 2022-04-30 023028

@kenjis
Copy link
Member

kenjis commented Apr 30, 2022

I recommend you never use git pull.
It creates a lot of troubles.
See https://stackoverflow.com/questions/15316601/in-what-cases-could-git-pull-be-harmful

@datamweb
Copy link
Contributor Author

I'm really tired. I am suffocating in a world of new information. Thanks for link.

@kenjis
Copy link
Member

kenjis commented Apr 30, 2022

Unfortunately, some people are unable to complete Pull Requests because they cannot use git properly.

But don't worry, git is not an easy tool, and it usually takes time to learn.

@datamweb
Copy link
Contributor Author

datamweb commented May 2, 2022

@kenjis Please check, did I do it right or not?
With your help, I will either find a way or I will build a way.

Copy link
Member

@kenjis kenjis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@kenjis kenjis merged commit 29abf4b into codeigniter4:develop May 2, 2022
@kenjis
Copy link
Member

kenjis commented May 2, 2022

@datamweb You did it! Perfect! 👍

@datamweb datamweb deleted the CodeCoverageEnable branch May 2, 2022 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants