Jump to content
  • 0

unfinished merge


mauricev
 Share

Question

13 answers to this question

Recommended Posts

  • 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.

 

Link to comment
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

 

Link to comment
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
 Share

×
×
  • Create New...