[Libreoffice] newish to git: howto recover from bad merge?

[Miklos Vajna]

On Fri, Nov 19, 2010 at 03:11:51AM -0500, Kevin Hunter <hunteke at earlham.edu> wrote:
> $ git status
> # Not currently on any branch.
> # Unmerged paths:
> #   (use "git reset HEAD <file>..." to unstage)
> #   (use "git add/rm <file>..." as appropriate to mark resolution)
> #
> #	both modified:      bf_svx/source/items/svx_xmlcnitm.cxx
> #
> no changes added to commit (use "git add" and/or "git commit -a")
> 
> $ git add bf_svx/source/items/svx_xmlcnitm.cxx
> 
> $ git commit
> # Not currently on any branch.
> nothing to commit (working directory clean)
> 
> $ git rebase --continue
> Applying: EasyHack: RTL macro from createFromAscii
> No changes - did you forget to use 'git add'?

As it writes, you need either 'git commit -a' or a 'git add' before 'git
commit'. :)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20101119/e6fb394f/attachment.pgp>