Re: High Sierra and MacPorts

2017-10-10 Thread [ftp83plus]
I won’t criticise the typos after reading my own grammar…;-) As for the processes, I often see kernel_task taking a rather large chunk of CPU. At the moment it’s hovering around 27%, but that’s an exception rather than the rule. Most of the time it’s just Firefox eating about 20% CPU doing

Re: cannot sync - pulling is not possible because you have unmerged files

2017-10-10 Thread db
On 10 Oct 2017, at 17:42, "Daniel J. Luke" wrote: > If the OP does have a need to be syncing from the git repository, he should > be able to manage any conflicts like this without help from the list. As I said, I didn't modify the checkout.

Re: cannot sync - pulling is not possible because you have unmerged files

2017-10-10 Thread Chris Jones
OK, that didn't help much. What is going wrong is clear. You have modifications in /opt/local/var/macports/sources/github.com/macports/macports-ports that are in conflict with the main repo and conflict when pulled in. *Why* you have these modifications, I cannot help you with... Maybe you

Re: cannot sync - pulling is not possible because you have unmerged files

2017-10-10 Thread db
On 10 Oct 2017, at 15:17, Chris Jones wrote: > So one or more of those modifications are your problem. The modifications in > your checkout conflict with something coming in from the sync. You need to > resolve these conflicts before trying again. I didn't modify the

Re: cannot sync - pulling is not possible because you have unmerged files

2017-10-10 Thread Chris Jones
So one or more of those modifications are your problem. The modifications in your checkout conflict with something coming in from the sync. You need to resolve these conflicts before trying again. On 10/10/17 14:15, db wrote: On 10 Oct 2017, at 15:08, Chris Jones

Re: cannot sync - pulling is not possible because you have unmerged files

2017-10-10 Thread Chris Jones
Hi, This is git, nothing to do with macports. Looks like you have made some modifications to the ports in your local git checkout which conflict with what is being pulled in during the sync. You need to go into your git checkout and fix the conflicts, whatever they are, by hand before trying

Re: High Sierra and MacPorts

2017-10-10 Thread Chris Jones
On 10/10/17 09:37, Chris Jones wrote: Have you running activity monitor to see what process is running, if there is one ? What you describe is not normal, for any is version. You have some process mid behaving. OK, that is far too many typos, even for me... "have you tried running

Re: High Sierra and MacPorts

2017-10-10 Thread Chris Jones
Have you running activity monitor to see what process is running, if there is one ? What you describe is not normal, for any is version. You have some process mid behaving. > On 10 Oct 2017, at 2:52 am, [ftp83plus] wrote: > > What MacBook is that? I have the MacBook5,2