Jump to content
funtoo forums
  • 0
mauricev

unfinished merge

Question

How do I fix this?

Syncing meta-repo
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
There was an error syncing meta-repo.

 

Share this post


Link to post
Share on other sites

14 answers to this question

Recommended Posts

  • 0

Should have known that earlier. Had that same problem a few days ago but did not find the right git commands to clean it. So I just dropped the old git directory and made a new clone. But this way is easier.

Share this post


Link to post
Share on other sites
  • 0

I now have a similar problem

Auto-merging README.rst
CONFLICT (content): Merge conflict in README.rst
Automatic merge failed; fix conflicts and then commit the result.
There was an error syncing meta-repo.

 

Share this post


Link to post
Share on other sites
  • 0

I made the script before the fix you just described was put in. But running ego sync by itself just results in the same error. How do I fix this new problem?

Syncing meta-repo
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
There was an error syncing meta-repo.

 

Share this post


Link to post
Share on other sites
  • 0
drwxr-xr-x 15 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/core-hw-kit
drwxr-xr-x 46 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/core-kit
drwxr-xr-x 20 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/desktop-kit
drwxr-xr-x 14 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/dev-kit
drwxr-xr-x 11 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/editors-kit
drwxr-xr-x 23 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/games-kit
drwxr-xr-x 53 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/gnome-kit
drwxr-xr-x 10 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/haskell-kit
drwxr-xr-x 12 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/java-kit
drwxr-xr-x 48 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/kde-kit
drwxr-xr-x 15 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/lang-kit
drwxr-xr-x 10 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/lisp-scheme-kit
drwxr-xr-x 17 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/media-kit
drwxr-xr-x 10 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/ml-lang-kit
drwxr-xr-x 37 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/net-kit
drwxr-xr-x 41 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/nokit
drwxr-xr-x 11 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/perl-kit
drwxr-xr-x  8 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/php-kit
drwxr-xr-x  9 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/python-kit
drwxr-xr-x 11 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/ruby-kit
drwxr-xr-x 17 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/science-kit
drwxr-xr-x 12 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/security-kit
drwxr-xr-x 11 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/text-kit
drwxr-xr-x  9 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/xfce-kit
drwxr-xr-x 20 portage portage 4096 Nov  2 00:30 /var/git/meta-repo/kits/xorg-kit
-rw-r--r--  1 portage portage 4512 Nov  4 14:05 /var/git/meta-repo/metadata/kit-info.json
-rw-r--r--  1 portage portage 2694 Nov  4 14:05 /var/git/meta-repo/metadata/kit-sha1.json
-rw-r--r--  1 root    root      89 Oct 22 17:25 /var/git/meta-repo/repos.conf/core-hw-kit
-rw-r--r--  1 root    root      83 Oct 22 17:25 /var/git/meta-repo/repos.conf/core-kit
-rw-r--r--  1 root    root      31 Oct 22 17:25 /var/git/meta-repo/repos.conf/default
-rw-r--r--  1 root    root      89 Oct 22 17:25 /var/git/meta-repo/repos.conf/desktop-kit
-rw-r--r--  1 root    root      81 Oct 22 17:25 /var/git/meta-repo/repos.conf/dev-kit
-rw-r--r--  1 root    root      89 Oct 22 17:25 /var/git/meta-repo/repos.conf/editors-kit
-rw-r--r--  1 root    root      85 Oct 22 17:25 /var/git/meta-repo/repos.conf/games-kit
-rw-r--r--  1 root    root      86 Oct 22 17:25 /var/git/meta-repo/repos.conf/gnome-kit
-rw-r--r--  1 portage portage   89 Nov  4 14:05 /var/git/meta-repo/repos.conf/haskell-kit
-rw-r--r--  1 root    root      83 Oct 22 17:25 /var/git/meta-repo/repos.conf/java-kit
-rw-r--r--  1 root    root      81 Oct 22 17:25 /var/git/meta-repo/repos.conf/kde-kit
-rw-r--r--  1 portage portage   83 Nov  4 14:05 /var/git/meta-repo/repos.conf/lang-kit
-rw-r--r--  1 portage portage   97 Nov  4 14:05 /var/git/meta-repo/repos.conf/lisp-scheme-kit
-rw-r--r--  1 root    root      85 Oct 22 17:25 /var/git/meta-repo/repos.conf/media-kit
-rw-r--r--  1 portage portage   89 Nov  4 14:05 /var/git/meta-repo/repos.conf/ml-lang-kit
-rw-r--r--  1 root    root      81 Oct 22 17:25 /var/git/meta-repo/repos.conf/net-kit
-rw-r--r--  1 root    root      81 Oct 22 17:25 /var/git/meta-repo/repos.conf/nokit
-rw-r--r--  1 root    root      83 Oct 22 17:25 /var/git/meta-repo/repos.conf/perl-kit
-rw-r--r--  1 root    root      81 Oct 22 17:25 /var/git/meta-repo/repos.conf/php-kit
-rw-r--r--  1 root    root      87 Oct 22 17:25 /var/git/meta-repo/repos.conf/python-kit
-rw-r--r--  1 portage portage   83 Nov  4 14:05 /var/git/meta-repo/repos.conf/ruby-kit
-rw-r--r--  1 root    root      90 Oct 22 17:25 /var/git/meta-repo/repos.conf/science-kit
-rw-r--r--  1 root    root      91 Oct 22 17:25 /var/git/meta-repo/repos.conf/security-kit
-rw-r--r--  1 root    root      83 Oct 22 17:25 /var/git/meta-repo/repos.conf/text-kit
-rw-r--r--  1 portage portage   83 Nov  4 14:05 /var/git/meta-repo/repos.conf/xfce-kit
-rw-r--r--  1 root    root      83 Oct 22 17:25 /var/git/meta-repo/repos.conf/xorg-kit

 

Share this post


Link to post
Share on other sites
  • 0

That worked. Thanks. Ego sync should have some mechanism in place to run that command internally should it again fail in this way. It should probably also check and correct any permission mismatches.

Share this post


Link to post
Share on other sites
Guest
You are commenting as a guest. If you have an account, please sign in.
Answer this question...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoticons maximum are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.


×