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:09:07 -0700 [thread overview]
Message-ID: <xmqqczdvaegs.fsf@gitster.g> (raw)
In-Reply-To: <YtwH7pOnDgv+MYmh@tapette.crustytoothpaste.net> (brian m. carlson's message of "Sat, 23 Jul 2022 14:38:38 +0000")
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> It's known that Dropbox and other cloud syncing services can corrupt
> repositories. They can cause files to be removed, renamed, or reappear
> after being deleted, and I suspect that's what's happening here.
> ...
> I'd recommend moving the data out of the Dropbox repository regardless,
> since, as I mentioned, it is known to cause corruption, and you won't
> know it until it's too late. You may want to additionally run "git
> fsck" to see if that finds any problems other than dangling objects.
An anticipated follow-up question is "but then how do I replicate
the repository across my machines? that is the reason why I have it
in Dropbox in the first place", and the above is a hard-to-follow
advice until it has a good answer.
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.
next prev parent reply other threads:[~2022-07-23 18:09 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 [this message]
2022-07-23 18:19 ` Junio C Hamano
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=xmqqczdvaegs.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.