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

Re: Dropbox and "Your local changes to the following files would be overwritten by merge"

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 23, 2022, 18:19 UTC
Message-ID
<xmqq7d43adzz.fsf@gitster.g>
In-Reply-To
<xmqqczdvaegs.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 10 quoted lines
> E.g. after finished working at a site, prepare to take the "latest"
> to the next place you will work at in a bundle,
>
>     $ git bundle create 2022-07-23.bndl --all HEAD
>     $ mv 2022-07-23.bndl $my_dropbox_directory/.
>
> and when you get to the next place to work at, you'd "fetch" from it
> into the repository you keep, or you can choose *NOT* to maintain
> any local copy there at all and "git clone" from the bundle every
> time you restart at a different place.

A practical real-world solution would certainly involve keeping reasonably fresh copies of repositories at each work location, and "git fetch --mirror" into it from the bundle. The "bundle create" command would most likely have some bottom revisions to reduce the size of the resulting bundle files, i.e. if you know that all copies of repositories you'd work with surely have the version you tagged "v53.8" a few weeks ago, then the "bundle create" command may have "--not v53.8" at the end.

In other words, the above is *NOT* meant to be a full solution, but merely to illustrate a possible direction to go in.

Previous: Junio C HamanoNext: Yuri Kanivetsky
Message 5 of 6 in “Dropbox and "Your local changes to the following files would be overwritten by merge"”
  1. Yuri KanivetskyJul 23, 2022
  2. rsbecker@nexbridge.comJul 23, 2022
  3. brian m. carlsonJul 23, 2022
  4. Junio C HamanoJul 23, 2022
  5. Junio C HamanoJul 23, 2022
  6. Yuri KanivetskyJul 26, 2022

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.