Differences

This shows you the differences between two versions of the page.

--- apps:git [2019-09-01 13:23] – [Troubleshooting/Q&A] more specific link jens
+++ apps:git [2019-09-02 14:23] – [Troubleshooting/Q&A] adding Q&A/troubleshooting steps jens
@@ Line 44: / Line 44: @@
 ===== Troubleshooting/Q&A =====
-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 ''git status'' to check that.
   * If you use this for [[:apps:puppet|Puppet]] code, you could just create a symlink from the Puppet code directory to your git project:((Providing you used the same structure as mandatory in the [[:apps:puppet#manifests|Puppet]] code directory. Don't forget to backup first!)) <code>ln -sf /srv/git/puppet.git /etc/puppet/code</code>
+  * In case you forgot to delete your branch on the server, or want to just delete it remotely, you can do that: <code>git push - u origin mybranch --delete</code>
+  * 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: <code>
+git fetch origin master
+git reset --hard FETCH_HEAD
+git clean -df</code>
 ====== 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't allow for this, unless you throw some serious scripting at it. If you want pipelines and e.g. [[https://jenkins.io/|Jenkins]], you need tools like [[https://github.com/|GitHub]].
 Unfortunately, they do not offer an open-source version of their software, just hosted by them or in an Enterprise Edition. Luckily, there is [[https://about.gitlab.com/|GitLab]] that provides all of this functionality. And: it will run on Debian :-) So if you want or need pipelines and Jenkins and user/privilege management etc, you should check out GitLab.