Re: [git-users] Synchronizing air gapped git repositories using bundles

2017-02-02 Thread Philip Oakley
transferred. My example would be: git bundle create mc1-20161201-20170202.bndl --ALL --since="2016.12.01" master so the bundle filename contains the full details of what where when... I've not come up against a 'verify' scenario where the bundle has a partial orphan branch from the

Re: [git-users] Synchronizing air gapped git repositories using bundles

2017-02-02 Thread Lowell Alleman
Philip, Thanks for the reply! The reason I'm looking at using a script is mostly for standardization. So that the file names are consistent and to capture some bundle metadata necessary for the file transfer process (file name, size, checksum, ...) We capture some metadata about the bundle

Re: [git-users] What's the correct way of selecting 'ours' or 'theirs' when encountering a merge conflict on push?

2017-02-02 Thread Magnus Therning
AD S writes: > Thanks for your detailed reply. That's very appreciated. Honestly, I'm > trying really hard to get my head around Git, but, for whatever > reason, it's just taking a long time to click with me. > > So, I guess what I was trying to do was your first example,

Re: [git-users] Git as a photo backup tool

2017-02-02 Thread Konstantin Khomoutov
On Wed, 25 Jan 2017 13:09:39 -0800 (PST) Carsten wrote: > My goal is to obtain a very simple backup system for typical JPEG > photos. Each photo is a few MB in size and there are several > thousands of them. [...] I'd say it doesn't worth it. I would just use borg

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-02-02 Thread Magnus Therning
Michael writes: >> Have you looked at git-imerge? > > Imerge looks like a really nice tool. How stable/sufficient is it? Why > is it not part of the normal git distribution? I've not had any problems with stability, but then I generally try to avoid ending up in situations

Re: [git-users] Git as a photo backup tool

2017-02-02 Thread Magnus Therning
Carsten writes: > Dear Git fellows, > > from plenty of web searches, I'm aware of Git's limitations regarding large > binary files and Git LFS as a possible solution, but have not yet tried > this myself, with or without LFS. Please allow me a question in the > "opposite"