Still having problems syncing my library to github

#1

I keep having problems with my sync, what is happening here?!?
They all seem to be modules which I editted after finding bugs/mistakes..

Sync (pull) FAILED : community (1.0.12,sirsicksik)
org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:
objects/sss/delay/Factotum.axo
objects/sss/dyn/comp1.axo
objects/sss/filter/filterCORE.axo
objects/sss/filter/filterSLAVE.axo
objects/sss/filter/paraMorph.axo
objects/sss/lfo/BPMext.axo
objects/sss/lfo/qtsLFO4.axo
objects/sss/logic/ABchance.axo
objects/sss/logic/countExt.axo
objects/sss/math/glide_multi.axo
objects/sss/math/ratios235.axo
objects/sss/midi/clock.axo
objects/sss/osc/blepped.axo
objects/sss/osc/gausOsc.axo
objects/sss/osc/hrmOsc2.axo
objects/sss/osc/pllOSC.axo
objects/sss/patt/rndPattF.axo
objects/sss/sel/4chanceSeq.axo
objects/sss/stomps/reverbMod.axs
org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:
objects/sss/delay/Factotum.axo
objects/sss/dyn/comp1.axo
objects/sss/filter/filterCORE.axo
objects/sss/filter/filterSLAVE.axo
objects/sss/filter/paraMorph.axo
objects/sss/lfo/BPMext.axo
objects/sss/lfo/qtsLFO4.axo
objects/sss/logic/ABchance.axo
objects/sss/logic/countExt.axo
objects/sss/math/glide_multi.axo
objects/sss/math/ratios235.axo
objects/sss/midi/clock.axo
objects/sss/osc/blepped.axo
objects/sss/osc/gausOsc.axo
objects/sss/osc/hrmOsc2.axo
objects/sss/osc/pllOSC.axo
objects/sss/patt/rndPattF.axo
objects/sss/sel/4chanceSeq.axo
objects/sss/stomps/reverbMod.axs
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:419)
at org.eclipse.jgit.api.PullCommand.call(PullCommand.java:331)
at axoloti.utils.AxoGitLibrary.pull(AxoGitLibrary.java:331)
at axoloti.utils.AxoGitLibrary.sync(AxoGitLibrary.java:70)
at axoloti.menus.FileMenu.jMenuSyncActionPerformed(FileMenu.java:264)
at axoloti.menus.FileMenu.access$400(FileMenu.java:51)
at axoloti.menus.FileMenu$5.actionPerformed(FileMenu.java:134)
at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2022)
at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2348)
at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402)
at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259)
at javax.swing.AbstractButton.doClick(AbstractButton.java:376)
at javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:833)
at javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:877)
at java.awt.Component.processMouseEvent(Component.java:6533)
at javax.swing.JComponent.processMouseEvent(JComponent.java:3324)
at java.awt.Component.processEvent(Component.java:6298)
at java.awt.Container.processEvent(Container.java:2236)
at java.awt.Component.dispatchEventImpl(Component.java:4889)
at java.awt.Container.dispatchEventImpl(Container.java:2294)
at java.awt.Component.dispatchEvent(Component.java:4711)
at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4888)
at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4525)
at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4466)
at java.awt.Container.dispatchEventImpl(Container.java:2280)
at java.awt.Window.dispatchEventImpl(Window.java:2746)
at java.awt.Component.dispatchEvent(Component.java:4711)
at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:758)
at java.awt.EventQueue.access$500(EventQueue.java:97)
at java.awt.EventQueue$3.run(EventQueue.java:709)
at java.awt.EventQueue$3.run(EventQueue.java:703)
at java.security.AccessController.doPrivileged(Native Method)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:80)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:90)
at java.awt.EventQueue$4.run(EventQueue.java:731)
at java.awt.EventQueue$4.run(EventQueue.java:729)
at java.security.AccessController.doPrivileged(Native Method)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:80)
at java.awt.EventQueue.dispatchEvent(EventQueue.java:728)
at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:201)
at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:116)
at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:105)
at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101)
at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:93)
at java.awt.EventDispatchThread.run(EventDispatchThread.java:82)
Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files:
objects/sss/delay/Factotum.axo
objects/sss/dyn/comp1.axo
objects/sss/filter/filterCORE.axo
objects/sss/filter/filterSLAVE.axo
objects/sss/filter/paraMorph.axo
objects/sss/lfo/BPMext.axo
objects/sss/lfo/qtsLFO4.axo
objects/sss/logic/ABchance.axo
objects/sss/logic/countExt.axo
objects/sss/math/glide_multi.axo
objects/sss/math/ratios235.axo
objects/sss/midi/clock.axo
objects/sss/osc/blepped.axo
objects/sss/osc/gausOsc.axo
objects/sss/osc/hrmOsc2.axo
objects/sss/osc/pllOSC.axo
objects/sss/patt/rndPattF.axo
objects/sss/sel/4chanceSeq.axo
objects/sss/stomps/reverbMod.axs
at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout(DirCacheCheckout.java:420)
at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:402)
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:293)
... 44 more

search path : C:\Users\Dixons\Documents\axoloti\axoloti-factory\objects
search path : C:\Users\Dixons\Documents\axoloti\objects
search path : C:\Users\Dixons\Documents\axoloti\axoloti-contribobjects
finished loading objects

SirSickSik Contributions
#2

the files it is listing have been changed on both the server (e.g. from another computer?!) and this computer, and it is unable to resolve the differences.
if you look at the files, you will see if highlights in them what has been changed in the two versions.

sorry, but its impossible for me to know how you got into this situation
I can only say that you have done sync from two places which conflict with each other, if you post one of the files here, I can tell you what has changed , but not why you are in that situation.

you have two options:
a) re-initialise the library, this will loose any local changes you had
b) resolve the conflicts using a tool that supports git.
e.g.

(you will then just open up the axoloti-contrib which is a GitHub repo)
basically, this will allow you to see the changes in the remote and local version and resolve the differences, and then commit them.

as your doing a lot of these things, this is probably worth spending a little bit of time investigating, as once you've done it once, it'll be obvious in the future.

#3

ah I didn't know that could become a problem... I'm indeed using another computer.
I expected it only checked my name and password when syncing to github.

My old computer runs windows7 and the new one windows10..
Could I perhaps fix it by giving the computers the same name?
Or by copying the changes to the old computer and sync from there?

#4

it shouldn't be a problem unless you make changes on both computers, then it tries to combine the changes, sometimes it can do this successfully, but other times the changes 'conflict' , so you have to choose which change you wish to keep, and which to discards... this is what the git tool allows you to do.

Id guess the following , is now the situation:
on one computer the library is fine , and the other one, you are getting these conflict errors.

the one you are getting the conflict errors, you either need to resolved, as discussed above, or simply reset it too what is stored on GitHub (which is what you can see on the other computer without the error) ... this may not include some changes you have made.

Id be interested to see one of the conflicting files... as it will show me what has changed on both computers.... perhaps this will reveal some 'workflow' you can avoid

you cannot copy from the computer that has these conflict errors, as these files have now been updated to included the changes from the other computer, and that is what has caused the error... i.e. these files are no longer valid axo files, unless you use the git tool too edit them.
(if you have a look inside one you will see what i mean)

#5

BPMext.axo (2.4 KB)

this is a conflicting one with not too many code in it.
I don't see any weird things at first sight..

#6

im confused that file is identical to the one in GitHub.

the version you have me, thats the one from the machine with the error , correct?

(also copying that file, unsurprisingly, because its identical :wink: to the directory does not result in a conflict error for me )

#7

yes, this is the file from my new computer.

It all started when I first used my new computer and found out not all my files had been uploaded to github, missing multiple files. (Which was probably because I while ago it seemed my github-login was somehow reset under preferences.)

Then I just copied my own axo-sss-folder from my old computer to my new computer (only actually copying the ones that were missing, skipping files that were the same)

#8

sorry, I cant really say without seeing the computer...

copying files, should work with Git , as its a file based system... nothing 'hidden' going on. but its not really the correct 'workflow', so its possible to get yourself in a mess... but because its not the 'right' way to do thing, to sort it out, you need to have a bit more git knowledge to know what is wrong.

one thing, if you are trying to transfer the repo from one computer to another, you have to make sure you take the hidden files as well (which reside in a .git directory)
also i seem to remember, it has to be in the same directory, as it was before.

if you start copying files then you must only then sync from the new computer, and on the old computer to a delete lib, to resync.... to ensure you are not accidentally changing files on two computers.

though seriously, id not start messing with this if you don't understand how git works.

.. this is why the Axoloti UI only supports a concept of syncing, to keep these complications away from users.
the intended workflow would be you sync the old computer to the cloud, then download the work to the new computer by sync from the cloud.
if this doesn't work, I suggest people delete library and resync...

what i would do if i were you is quite simple...
move the folder with the offending conflicts somewhere else on your drive.
sync from the cloud, then check the files that had the conflict, to see if you want the one from the cloud, or the backup directory you just created.

p.s. all the above is not a limitation of git, thousands of programmers do simultaneous changes to files every day, but they know about version control systems, and how to merge changes, and also prevent conflicts... also they can edit the underlying files directly. (e.g. the equivalent of editing a axo file with a text editor) ... these are all things we do not want to get into with Axoloti.