Added master if fail fait dev*

bin/removeMerged.sh

@@ -7,6 +7,10 @@ if [ $? = 1 ] ; then
     git checkout dev
 fi
 
+if [ $? = 1 ] ; then
+    git checkout master
+fi
+
 # Get last changes
 git pull
 

dotfiles/.oh-my-zsh/custom/themes/tywr.zsh-theme

@@ -0,0 +1,17 @@
+# Based on https://github.com/TyWR/Nord-zsh
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[white]%} on %{$fg_bold[yellow]%}\xee\x82\xa0 "
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[yellow]%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$reset_color%}%{$fg_bold[red]%}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+conda_env() {
+    if [ ! -z "$CONDA_PREFIX" ]
+    then
+        print -n " %{$fg_bold[white]%}on %{$fg_bold[blue]%}ꓛ ${CONDA_PREFIX##*/}%{$reset_color%}"
+    fi
+}
+
+PROMPT='
+ %{$fg_bold[green]%}%3c%{$reset_color%}$(git_prompt_info)$(conda_env)
+ %{$fg_bold[blue]%}${(%):-%m} ➜ %{$reset_color%}'