apps:git
Differences
This shows you the differences between two versions of the page.
Next revision | Previous revisionNext revisionBoth sides next revision | ||
apps:git [2019-08-31 16:14] – Initial writing jens | apps:git [2020-01-02 15:30] – [Troubleshooting/Q&A] Typo jens | ||
---|---|---|---|
Line 44: | Line 44: | ||
===== Troubleshooting/ | ===== Troubleshooting/ | ||
- | For now, just two things. This section will be expanded in future. | ||
* If you ever wonder what branch you are on, you can just run a '' | * If you ever wonder what branch you are on, you can just run a '' | ||
- | * If you use this for [[: | + | * If you use this for [[: |
+ | * In case you forgot to delete your branch on the server, or want to just delete it remotely, you can do that: < | ||
+ | * If you already started editing but forgot to switch to a new development branch, in many cases it is still possible to just switch to a new branch after you made changes already and just follow the workflow. | ||
+ | * In case the local (master) branch is no longer usable, use these steps to reset it: < | ||
+ | git fetch origin master | ||
+ | git reset --hard FETCH_HEAD | ||
+ | git clean -df</ | ||
====== What next? ====== | ====== What next? ====== | ||
Actually, stuff like parsing & linting, merging on the server and deploying your code where it belongs (e.g. Puppet) should be automated. A basic git setup like this doesn' | Actually, stuff like parsing & linting, merging on the server and deploying your code where it belongs (e.g. Puppet) should be automated. A basic git setup like this doesn' | ||
- | Unfortunately, | + | Unfortunately, |
apps/git.txt · Last modified: 2024-05-20 13:50 by jens