Re: git pull opinion

From: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Date: Nov 7, 2007, 07:06 UTC
Message-ID: <20071107070646.GA3417@informatik.uni-freiburg.de>
In-Reply-To: <4730AD48.2050907@obry.net>

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...

Best regards Uwe

-- 
Uwe Kleine-König

http://www.google.com/search?q=1+year+in+days

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.