From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: Yuri Kanivetsky <yuri.kanivetsky@gmail.com>, git@vger.kernel.org
Subject: Re: Dropbox and "Your local changes to the following files would be overwritten by merge"
Date: Sat, 23 Jul 2022 11:19:12 -0700 [thread overview]
Message-ID: <xmqq7d43adzz.fsf@gitster.g> (raw)
In-Reply-To: <xmqqczdvaegs.fsf@gitster.g> (Junio C. Hamano's message of "Sat, 23 Jul 2022 11:09:07 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> 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.
next prev parent reply other threads:[~2022-07-23 18:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-23 12:40 Dropbox and "Your local changes to the following files would be overwritten by merge" Yuri Kanivetsky
2022-07-23 13:16 ` rsbecker
2022-07-23 14:38 ` brian m. carlson
2022-07-23 18:09 ` Junio C Hamano
2022-07-23 18:19 ` Junio C Hamano [this message]
2022-07-26 2:38 ` Yuri Kanivetsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7d43adzz.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sandals@crustytoothpaste.net \
--cc=yuri.kanivetsky@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).