mauricev Posted October 21, 2017 Report Share Posted October 21, 2017 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. Link to comment Share on other sites More sharing options...
0 Funtoo Linux BDFL drobbins Posted October 21, 2017 Funtoo Linux BDFL Report Share Posted October 21, 2017 # cd /var/git/meta-repo # git reset --hard # git clean -fd jhan 1 Link to comment Share on other sites More sharing options...
0 mauricev Posted October 22, 2017 Author Report Share Posted October 22, 2017 Couldn't ego sync be programmed to do this automatically should it encounter this state? Link to comment Share on other sites More sharing options...
0 Funtoo Linux BDFL drobbins Posted October 23, 2017 Funtoo Linux BDFL Report Share Posted October 23, 2017 Yes, in theory it could be added and would probably be a good idea if it did this. Please open a bug for this on the bug tracker and I'll add it. Link to comment Share on other sites More sharing options...
0 mauricev Posted November 4, 2017 Author Report Share Posted November 4, 2017 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. Link to comment Share on other sites More sharing options...
0 Oleg Vinichenko Posted November 4, 2017 Report Share Posted November 4, 2017 the fix to this is same as in post #2 are you changing the files manually in meta-repo? Link to comment Share on other sites More sharing options...
0 mauricev Posted November 4, 2017 Author Report Share Posted November 4, 2017 13 hours ago, Oleg Vinichenko said: the fix to this is same as in post #2 are you changing the files manually in meta-repo? I always run this fix prior to doing an ego sync. Link to comment Share on other sites More sharing options...
0 Oleg Vinichenko Posted November 4, 2017 Report Share Posted November 4, 2017 ego sync does clean and reset steps, so you don't need to make them prior to 'ego sync'. or is there a reason why you making this before syncing meta-repo? Link to comment Share on other sites More sharing options...
0 mauricev Posted November 4, 2017 Author Report Share Posted November 4, 2017 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 More sharing options...
0 Oleg Vinichenko Posted November 4, 2017 Report Share Posted November 4, 2017 show output of ls -dl /var/git/meta-repo/*/* Link to comment Share on other sites More sharing options...
0 mauricev Posted November 4, 2017 Author Report Share Posted November 4, 2017 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 More sharing options...
0 Oleg Vinichenko Posted November 4, 2017 Report Share Posted November 4, 2017 this looks good apart from some permission diffs. try mv /var/git/meta-repo /var/git/meta-repo.old and then ego sync this will give you a pristine fresh copy of meta-repo. Link to comment Share on other sites More sharing options...
0 mauricev Posted November 4, 2017 Author Report Share Posted November 4, 2017 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. Link to comment Share on other sites More sharing options...
0 Funtoo Linux BDFL drobbins Posted November 7, 2017 Funtoo Linux BDFL Report Share Posted November 7, 2017 This has been added to ego-2.3.0. Link to comment Share on other sites More sharing options...
Question
mauricev
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.Link to comment
Share on other sites
13 answers to this question
Recommended Posts