apps:git
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
apps:git [2019-09-02 14:23] – [Troubleshooting/Q&A] adding Q&A/troubleshooting steps jens | apps:git [2020-01-02 16:30] – [Troubleshooting/Q&A] Typo jens | ||
---|---|---|---|
Line 46: | Line 46: | ||
* 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: < | + | * 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. | * 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: < | * In case the local (master) branch is no longer usable, use these steps to reset it: < | ||
Line 55: | Line 55: | ||
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: 2020-07-24 09:34 by jens