... | ... | @@ -10,11 +10,7 @@ |
|
|
- [Install required software on your computer](install-development-environment) (workstations at FI MU are already pre-installed)
|
|
|
- [Set up the IDE and useful shortcuts](working-with-ide)
|
|
|
- [Using IDE at school](Using-IDE-at-school)
|
|
|
- [IntelliJ IDEA Troubleshooting](IntelliJ-IDEA-Troubleshooting)
|
|
|
- **Troubleshooting**
|
|
|
- When I push my solution to GitLab, I got an email saying _Your pipeline has failed_.
|
|
|
- Click (in your email) **build** button for more information why the compilation has failed.
|
|
|
So, either the tests didn't pass, or the checkstyle showed some checkstyle errors.
|
|
|
- [IntelliJ IDEA troubleshooting](IntelliJ-IDEA-Troubleshooting)
|
|
|
|
|
|
# Git workflow
|
|
|
- [Simplified git usage](git-basic-setup) (submission via "odevzdávárna v IS")
|
... | ... | @@ -22,24 +18,6 @@ |
|
|
- [Guide to **advanced git setup**](git-advanced-setup) (steps 1-2 in the scheme).
|
|
|
- [Guide what to do **every week** after that](git-every-week) (steps 3-8 in the scheme).
|
|
|
- [Guide to **homework** submission](git-homework).
|
|
|
- [Git troubleshoting](Git-Troubleshooting)
|
|
|
|
|
|
![git-scheme](uploads/d093a48b1e0dba6d47d095d4e6f08636/git-scheme.png) |
|
|
|
|
|
- **Troubleshooting**
|
|
|
- Git says `fatal: refusing to merge unrelated histories`.
|
|
|
- Add `--allow-unrelated-histories` argument and try again.
|
|
|
- I cannot push to git, I am getting a message:
|
|
|
```GitLab: you are not allowed to push code to this project. Fatal: Could not read from remote repository.```
|
|
|
- You are probably pushing to public repository. You want to push to your private one.
|
|
|
- I cannot pull iteration.
|
|
|
- You probably have uncommited changes. The solution is one of these:
|
|
|
- commit (save) changes: `git add -A && git commit -m "Message"`
|
|
|
- remove (delete) changes: `git reset --hard`
|
|
|
- I get an error `Git command returned with the following error: <some-url>: 404 Not Found`.
|
|
|
- Check your URL ends with **.git**, or use the _copy button_ on the project's gitlab web page
|
|
|
|
|
|
- When I push my code to GitLab, I got an email saying _Your pipeline has failed_.
|
|
|
- If you pushed an unfinished code, ignore this mail.
|
|
|
- If you pushed a final code and your IDE doesn't show any error, then it usually means that you skip the unit and/or checkstyle tests on your computer. When using IntelliJ IDEA, check the [IntelliJ IDEA Troubleshooting page](IntelliJ-IDEA-Troubleshooting).
|
|
|
- Anyway, click (in your email) **build** button for more information on why the compilation has failed. Either the tests didn't pass, or the checkstyle showed some checkstyle errors.
|
|
|
|