how to rebase with git lfs? #1287
Comments
|
So .... I tried starting over. I found out so anyway still gets the exact same error at the same spot |
|
I also tried doing this Then I set the commit were lfs was first added to Unfortunately rebase failed at the I see the The log says |
|
latest attempt I started over. I clone repoA from githib then I added lfs I then added repoB as a remote I then fetched all of repoB I then made a branch based on repoB that seems closer to what I'm supposed to do but it also failed it's the same error as before |
I think the bigger thing here is that the LFS docs are woefully inadequate, and some kind of User Guide is needed. That is definitely on the roadmap. Regarding your error at the end:
That simply means your LFS remote doesn't have that |
|
Thanks. But I'm still kind of lost. From repoB? I get an error. I tried started over like this This works. I see it get the LFS files so it must be new repos just work but. Ok, let's merge A into B fails Okay try again This works. I see lfs download the file. Apparently lfs only works with Okay let's rebase Fails with the same errors as above Ok maybe because master is tracking repoB? same error as above Ideas? |
|
Unfortunately, there's no way to pass the git remote down from a |
|
Thanks! That seemd to do it. So just for the next person this seemed to work |
|
This may work a little better: # This disables smudging for the 'git clone'
# and then calls 'git lfs pull' for you
git lfs clone git@github.com:me/repoB.git
cd repoB
git lfs install --skip-smudge --local # affects only this clone
git fetch repoA
git checkout -b temp repoA/somebranch
git rebase master
git lfs fetch --all repoA
git lfs checkout
git push origin temp
git lfs push --all origin temp
git lfs install --force --localThe If you want to disable the smudge filter for a single command, you can also use $ GIT_LFS_SKIP_SMUDGE=1 git pull
$ git lfs pull |
I've got a repoA with 2 lfs tracked files. I'm bringing that repo into repoB like this
note there is no common history between the 2 repos and should be no file conflicts either.
Anyway, this prints several lines of "Applying: ..." and then
How do I fix this?
git status showed this
Note: I tried just adding and committing the 2 files (voodoo) and then
git rebase --continuewhich kept going until the next time the file was modified in the history at which point it got a similar error. I did the same thing and it finally finished. But then when I tried to rebase that onto another branch I gotWhich kind of suggests I have no clue how to use git lfs correctly.
Is this supposed to work? Did miss a step? Should I have done something in repoB before rebasing? repoB is on the same machine but had no lfs files in it (no .gitattributes). that file doesn't appear until well into the history of repoA (where a large binary file was first needed).
The text was updated successfully, but these errors were encountered: