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

Re: [PATCH (GITK) v3 4/6] gitk: Make cherry-pick call git-citool on conflicts.

From
Paul Mackerras <paulus@samba.org>
Date
Nov 7, 2008, 11:51 UTC
Message-ID
<18708.11215.667112.83201@cargo.ozlabs.ibm.com>
In-Reply-To
<1225652389-22082-5-git-send-email-angavrilov@gmail.com>
Alexander Gavrilov writes:
> Now that git-gui has facilities to help users resolve
> conflicts, it makes sense to launch it from other GUI
> tools when they happen.

The resolution capabilities of git citool seem to be that it detects the conflict markers and lets you run meld on the 3 versions. Have I missed anything there? Do people find that fixing things manually in meld is sufficient, or do we really want something more powerful?

Paul.
Previous: Alexander GavrilovNext: Paul Mackerras
Message 17 of 21 in “Enhance popup dialogs in gitk.”
  1. 0/6 Enhance popup dialogs in gitk.Alexander Gavrilov, Nov 2, 2008
  2. 1/6 gitk: Add Return and Escape bindings to dialogs.Alexander Gavrilov, Nov 2, 2008
  3. 2/6 gitk: Make gitk dialog windows transient.Alexander Gavrilov, Nov 2, 2008
  4. 3/6 gitk: Add accelerators to frequently used menu commands.Alexander Gavrilov, Nov 2, 2008
  5. 4/6 gitk: Make cherry-pick call git-citool on conflicts.Alexander Gavrilov, Nov 2, 2008
  6. 5/6 gitk: Implement a user-friendly Edit View dialog.Alexander Gavrilov, Nov 2, 2008
  7. 6/6 gitk: Explicitly position popup windows.Alexander Gavrilov, Nov 2, 2008
  8. Paul MackerrasNov 7, 2008
  9. Alex RiesenNov 7, 2008
  10. Johannes SixtNov 7, 2008
  11. Alex RiesenNov 9, 2008
  12. Paul MackerrasNov 9, 2008
  13. Alexander GavrilovNov 9, 2008
  14. Paul MackerrasNov 10, 2008
  15. Alexander GavrilovNov 10, 2008
  16. Alexander GavrilovNov 11, 2008
  17. Paul MackerrasNov 7, 2008
  18. Paul MackerrasNov 7, 2008
  19. Alexander GavrilovNov 9, 2008
  20. Paul MackerrasNov 7, 2008
  21. Paul MackerrasNov 7, 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.