Re: problems with git and maintaining files

[Charles E Campbell]

Christ van Willegen wrote:
>
> git stash
> git checkout / git revert
> git stash pop
> ?
>
> Sorry, getting terse, tablets are not helpful for
> cutting/pasting/editing...
>
I understand -- I try to avoid using my tablet to say much via email. 
I'll give this a go the next time I have the problem.

Thank you,
Chip Campbell

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: problems with git and maintaining files

[Charles E Campbell]

Marius Gedminas wrote:
> On Fri, Aug 19, 2016 at 04:56:34PM -0400, Charles E Campbell wrote:
>> Charles E Campbell wrote:
>>> Christ van Willegen wrote:
 Op 19 aug. 2016 22:28 schreef "Charles E Campbell"
 >:
> I tried git stash push instead of git push -- and it still doesn't work:
 Probably only 'stash' then...

>>> That doesn't work either, unfortunately:
>>>
>>> runtime/syntax/sh.vim: needs merge
>>> runtime/syntax/sh.vim: needs merge
>>> runtime/syntax/sh.vim: unmerged (711971ea4ae7b3a72c2062c18130b3eca35dc67b)
>>> runtime/syntax/sh.vim: unmerged (34b8ab79e45bb1f39827e940e4b3428bedfad64b)
>>> runtime/syntax/sh.vim: unmerged (b285b04979551b260ab016ba089d9e69ded01612)
>>> fatal: git-write-tree: error building trees
>>> Cannot save the current index state
>>> Mruntime/doc/syntax.txt
>>> Uruntime/syntax/sh.vim
>>> Pull is not possible because you have unmerged files.
>>> Please, fix them up in the work tree, and then use 'git add/rm '
>>> as appropriate to mark resolution, or use 'git commit -a'.
>>> runtime/syntax/sh.vim: needs merge
>>> Cannot apply to a dirty working tree, please stage your changes
>>>
>> Oh, well -- I tried several things based on web searches, and none of
>> them worked.  I just went ahead and did what I know does work -- save
>> off the affected files manually, wipe out the local copy, git clone
>> https://github.com/vim/vim.git, and manually copy the affected files
>> back to where they needed to be.
> An entire full clone must be painful.  A simpler solution that doesn't
> rely on any advanced git mastery would be
>
>mv runtime/syntax/sh.vim runtime/syntax/sh.vim.mine  # for each file
>git checkout .  # restore pristine upstream versions of every file
>git pull
>mv runtime/syntax/sh.vim.mine runtime/syntax/sh.vim  # for each file
>
I'll try this the next time I have the problem -- looks like it should work.

Thank you,
Chip Campbell

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: problems with git and maintaining files

[Marius Gedminas]

On Fri, Aug 19, 2016 at 04:56:34PM -0400, Charles E Campbell wrote:
> Charles E Campbell wrote:
> > Christ van Willegen wrote:
> >> Op 19 aug. 2016 22:28 schreef "Charles E Campbell"
> >> >:
> >>> I tried git stash push instead of git push -- and it still doesn't work:
> >> Probably only 'stash' then...
> >>
> > That doesn't work either, unfortunately:
> >
> > runtime/syntax/sh.vim: needs merge
> > runtime/syntax/sh.vim: needs merge
> > runtime/syntax/sh.vim: unmerged (711971ea4ae7b3a72c2062c18130b3eca35dc67b)
> > runtime/syntax/sh.vim: unmerged (34b8ab79e45bb1f39827e940e4b3428bedfad64b)
> > runtime/syntax/sh.vim: unmerged (b285b04979551b260ab016ba089d9e69ded01612)
> > fatal: git-write-tree: error building trees
> > Cannot save the current index state
> > Mruntime/doc/syntax.txt
> > Uruntime/syntax/sh.vim
> > Pull is not possible because you have unmerged files.
> > Please, fix them up in the work tree, and then use 'git add/rm '
> > as appropriate to mark resolution, or use 'git commit -a'.
> > runtime/syntax/sh.vim: needs merge
> > Cannot apply to a dirty working tree, please stage your changes
> >
> Oh, well -- I tried several things based on web searches, and none of
> them worked.  I just went ahead and did what I know does work -- save
> off the affected files manually, wipe out the local copy, git clone
> https://github.com/vim/vim.git, and manually copy the affected files
> back to where they needed to be.

An entire full clone must be painful.  A simpler solution that doesn't
rely on any advanced git mastery would be

   mv runtime/syntax/sh.vim runtime/syntax/sh.vim.mine  # for each file
   git checkout .  # restore pristine upstream versions of every file
   git pull
   mv runtime/syntax/sh.vim.mine runtime/syntax/sh.vim  # for each file

HTH,
Marius Gedminas
-- 
To err is human, but to really foul things up requires a computer.

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


signature.asc
Description: PGP signature

Re: problems with git and maintaining files

[Charles E Campbell]

Charles E Campbell wrote:
> Christ van Willegen wrote:
>> Op 19 aug. 2016 22:28 schreef "Charles E Campbell"
>> >:
>>> I tried git stash push instead of git push -- and it still doesn't work:
>> Probably only 'stash' then...
>>
>>
> That doesn't work either, unfortunately:
>
> runtime/syntax/sh.vim: needs merge
> runtime/syntax/sh.vim: needs merge
> runtime/syntax/sh.vim: unmerged (711971ea4ae7b3a72c2062c18130b3eca35dc67b)
> runtime/syntax/sh.vim: unmerged (34b8ab79e45bb1f39827e940e4b3428bedfad64b)
> runtime/syntax/sh.vim: unmerged (b285b04979551b260ab016ba089d9e69ded01612)
> fatal: git-write-tree: error building trees
> Cannot save the current index state
> Mruntime/doc/syntax.txt
> Uruntime/syntax/sh.vim
> Pull is not possible because you have unmerged files.
> Please, fix them up in the work tree, and then use 'git add/rm '
> as appropriate to mark resolution, or use 'git commit -a'.
> runtime/syntax/sh.vim: needs merge
> Cannot apply to a dirty working tree, please stage your changes
>
Oh, well -- I tried several things based on web searches, and none of
them worked.  I just went ahead and did what I know does work -- save
off the affected files manually, wipe out the local copy, git clone
https://github.com/vim/vim.git, and manually copy the affected files
back to where they needed to be.

Regards,
Chip Campbell

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.