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

mergetool feature request - select remote or local

From
Caleb Cushing <xenoterracide@gmail.com>
Date
May 14, 2008, 11:21 UTC
Message-ID
<200805140721.13719.xenoterracide@gmail.com>

sometimes when merge-ing fast forward doesn't work. but you know what the resolution you want is.

example (current behavior)
Normal merge conflict for 'css/main.css':
  {local}: modified
  {remote}: modified
Hit return to start merge resolution tool (vimdiff):

but I don't want to. I know the remote updates are right. I could do a git checkout remotebranch filename but when you have 20 files that need updating this is annoying

my suggestion is this
Normal merge conflict for 'css/main.css':
  {local}: modified
  {remote}: modified
Use (l)local or (r)remote or (m)anual? 

also in the event of having 20 files with this issue it would be nice to have an option after first starting mergetool for remote all or local all.

(note: I am not subscribed to the list)
-- 
Caleb Cushing

my blog http://xenoterracide.blogspot.com
Next: Junio C Hamano
Message 1 of 5 in “mergetool feature request - select remote or local”
  1. Caleb CushingMay 14, 2008
  2. Junio C HamanoMay 14, 2008
  3. Daniel BarkalowMay 14, 2008
  4. Junio C HamanoMay 14, 2008
  5. Caleb CushingMay 15, 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.