login
Header Space

 
 

Re: bug?: stgit creates (unneccessary?) conflicts when pulling

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <kha@...>
Cc: git <git@...>
Date: Tuesday, February 28, 2006 - 11:00 am

On 27/02/06, Catalin Marinas <catalin.marinas@gmail.com> wrote:

I tried some simple tests with the idea above. I attached a patch if
you'd like to try (I won't push it to the main StGIT repository yet.
For safety reasons, it only skips the merged patches when pushing
them. A future version could simply delete the merged patches.

--
Catalin
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: bug?: stgit creates (unneccessary?) conflicts when pulling, Catalin Marinas, (Tue Feb 28, 11:00 am)
speck-geostationary