Uwe Kleine-König a écrit : > Hello, > >> I'm using: >> >> $ git config --global alias.update '!git stash && git pull && git stash apply' > I wonder how this works, if the merge produces conflicts... If you have conflicts it will not do the "git stash apply" as git pull will return with an error. So you'll need to fix the conflicts and do you the final git stash manually. Pascal. -- --|------------------------------------------------------ --| Pascal Obry Team-Ada Member --| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE --|------------------------------------------------------ --| http://www.obry.net --| "The best way to travel is by means of imagination" --| --| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
