git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Stgit and refresh-temp

From
Jon Smirl <jonsmirl@gmail.com>
Date
Nov 4, 2008, 14:50 UTC
Message-ID
<9e4733910811040650k2b63856fpf20f4b654780c658@mail.gmail.com>
In-Reply-To
<9e4733910811040538v604d33e3jf0b312d809630af2@mail.gmail.com>

I think I fixed my tree up. After a stg repair I was able to delete 'refresh-temp' which was empty, then apply the changes to jds-lirc.

It may have been possible to make the merge smarter. The conflicts were with things in the popped-off patches. Your typical end of file append merge conflicts.

On Tue, Nov 4, 2008 at 8:38 AM, Jon Smirl <jonsmirl@gmail.com> wrote:
Show 11 quoted lines
> jonsmirl@terra:~/fs$ stg version
> Stacked GIT 0.14.3.270.g0f36
> git version 1.6.0.3.523.g304d0
> Python version 2.5.2 (r252:60911, Oct  5 2008, 19:29:17)
> [GCC 4.3.2]
> jonsmirl@terra:~/fs$
>
> --
> Jon Smirl
> jonsmirl@gmail.com
>
-- 
Jon Smirl
jonsmirl@gmail.com
Previous: Jon SmirlNext: Karl Hasselström
Message 3 of 14 in “Stgit and refresh-temp”
  1. Jon SmirlNov 4, 2008
  2. Jon SmirlNov 4, 2008
  3. Jon SmirlNov 4, 2008
  4. Karl HasselströmNov 7, 2008
  5. Jon SmirlNov 10, 2008
  6. Jon SmirlNov 10, 2008
  7. Catalin MarinasNov 11, 2008
  8. Karl HasselströmNov 12, 2008
  9. Catalin MarinasNov 12, 2008
  10. Karl HasselströmNov 12, 2008
  11. Catalin MarinasNov 23, 2008
  12. Karl HasselströmNov 24, 2008
  13. Jon SmirlNov 24, 2008
  14. Karl HasselströmNov 12, 2008

Read the whole thread, see it on lore, or plain text.

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