Skip to content

Commit

Permalink
Update shortcuts_and_apps_setup.md
Browse files Browse the repository at this point in the history
  • Loading branch information
AmineDjeghri authored May 3, 2024
1 parent bd70418 commit 0dca560
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions docs/shortcuts_and_apps_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,9 @@ shortcuts: You can read more about the shortcuts [here](https://github.com/glaze
- Use docker with pycharm, very easy to pull and create images & containers. Specially if you want to test your app, you can create a ubuntu container in less then 5sec.
- Sync pycharm settings : https://www.jetbrains.com/help/pycharm/sharing-your-ide-settings.html#IDE_settings_sync
- Commits : [doc](https://www.jetbrains.com/help/pycharm/log-tab.html)
- pre-commit hooks : If you use conda as an interpreter in pycharm, you need to install pre-commit with conda and install the hooks (both are required)
```sh
conda install pre-commit
pre-commit install
```
- Use the amend commit if you want to concatenate commits
- pre-commit hooks : If you use conda as an interpreter in pycharm, you need to install pre-commit with pip in the environment that you are using. After the installation, see in the commit options (wheel button) next to the message if `Run git hooks` is there. If it isn't then restart pycharm.
- When you write in your terminal : `pip list | grep pre-commit` you should see the package. Running `pre-commit --version` should also work.
- Check the Amend commit box if you want to concatenate commits
- If you want to delete a pushed commit :
- Make sure that the branch isn't protected : open IDE settings Ctrl+Alt+S then go to git settings. You will see in the Push settings the protected branches. Note that if a branch is marked as protected on GitHub, PyCharm will automatically mark it as protected when you check it out but you can modify it.
- To delete a pushed commit, you have to options: drop a commit, or reset a current branch to a specific commit. After doing one or the other open the push panel and instead of selecting 'push', select 'force push'. Remember that you need to force push, otherwise pycharm will tell you that there are changes on the remote that need to be merged.
Expand Down

0 comments on commit 0dca560

Please sign in to comment.