latest sync

[imesg]

Not sure what to do with this. How do I stash or commit?

Thanks

Syncing repository 'lto-overlay' into '/var/lib/layman/lto-overlay'...
Starting layman sync for lto-overlay...

• Running Git... # ( cd /var/lib/layman/lto-overlay && /usr/bin/git pull )
  remote: Enumerating objects: 13, done.
  remote: Counting objects: 100% (13/13), done.

remote: Compressing objects: 100% (1/1), done.
remote: Total 7 (delta 4), reused 6 (delta 4), pack-reused 0
Unpacking objects: 100% (7/7), done.
From https://github.com/InBetweenNames/gentooLTO
d1bcc3e..27ede1e master -> origin/master
Updating d1bcc3e..27ede1e
error: Your local changes to the following files would be overwritten by merge:
sys-config/ltoize/files/package.cflags/ltoworkarounds.conf
Please commit your changes or stash them before you merge.
Aborting

• Failure result returned from Git
• Errors:

• ---

• Failed to sync overlay "lto-overlay".
• Error was: Syncing overlay "lto-overlay" returned status 1!
• db.sync()

[elsandosgrande]

Did you edit ltoworkarounds.conf? If so, unmerge ltoize and reemerge it. I had the same issue in June.

Trust me, just use separate configuration files for your personal workarounds.

@InBetweenNames This should be added to the README.

[imesg]

How to use separate configuration files? Put something in /etc/portage/package.cflags? Where to find the syntax of ltoworkarounds.conf.

Also elsandosgrande I want to know what 'commit' and 'stash' refer to.

[elsandosgrande]

For the git stuff, the internet is a better teacher than me. Trust me.
This is something that I found withing ten seconds of opening a new tab. It is the third result on DuckDuckGo.

Regarding the configuration files, here's my directory tree:

sandy@sandys-pavilion:~$ ls -al /etc/portage/package.cflags/
total 104
drwxr-xr-x 2 root root 4096  8月 29 15:22  .
drwxr-xr-x 9 root root 4096  8月 31 18:44  ..
-rw-r--r-- 1 root root   47  8月 21 22:51 'android tools.conf'
-rw-r--r-- 1 root root   31  8月  8 13:31  apr.conf
-rw-r--r-- 1 root root   42  8月 21 22:51 'apr util.conf'
-rw-r--r-- 1 root root  113  8月 18 02:17  audacity.conf
-rw-r--r-- 1 root root   44  8月  9 22:07  berk.conf
-rw-r--r-- 1 root root   76  7月 17 18:30  blender.conf
-rw-r--r-- 1 root root   58  8月 18 14:48  chemical.conf
-rw-r--r-- 1 root root   93  8月 16 19:00  darktable.conf
-rw-r--r-- 1 root root   56  8月 21 22:09  ffmpeg.conf
-rw-r--r-- 1 root root   74  7月 22 19:31  glibc.conf
-rw-r--r-- 1 root root   48  8月  7 17:41  glib.conf
-rw-r--r-- 1 root root   44  7月 27 10:58  ktp-call-ui.conf
-rw-r--r-- 1 root root   53  8月 21 22:09  lapack.conf
-rw-r--r-- 1 root root   42  8月 14 18:50  libprojectm.conf
-rw-r--r-- 1 root root   69  8月  7 18:09  libreoffice.conf
-rw-r--r-- 1 root root   99  8月 27 15:23 'libvirt python.conf'
lrwxrwxrwx 1 root root   84  8月 23 12:39  ltoworkarounds.conf -> /var/db/repos/lto-overlay/sys-config/ltoize/files/package.cflags/ltoworkarounds.conf
-rw-r--r-- 1 root root   50  8月 21 22:17  mysql.conf
-rw-r--r-- 1 root root  147  8月 13 02:09 'net snmp.conf'
-rw-r--r-- 1 root root   53  8月 12 23:00  nodejs.conf
-rw-r--r-- 1 root root 1244  8月 17 01:38  opencv.conf
-rw-r--r-- 1 root root   98  8月  8 15:27  proj.conf
-rw-r--r-- 1 root root   64  8月  8 20:08  pycryptodome.conf
-rw-r--r-- 1 root root   40  7月 28 20:15  python-systemd.conf

I am still working on some things...

[InBetweenNames]

@imesg to resolve this, you can do the following:

cd /path/to/lto-overlay
git stash
git pull
git stash apply

Then you just have to resolve the conflicts manually.

Alternatively, you can keep your own workarounds in a separate file, like package.cflags/privateworkarounds.conf and put your own workarounds in there.
If you have new workarounds to contribute, you could make a pull request on GitHub and get them merged here for you. Hope this helps.