Git – merge conflicts – simplified

Ahh – super easy to understand. I already knew this – but a refresher to say “do what you have been doing” is always reassuring. HOWEVER …. this is a nice website to read and understand for those dicey situations. http://githubtraining.com/fix-merge-conflict-git-using-sourcetree/ 

Share Button

Git force reset – a stackoverflow of a gazzilion good ideas

I needn’t say more. Here is the link. In specific – this part of the conversation allowed me to keep changes that were NOT part of the other guy’s work AND force his stuff on top of mine. I was fiddling (to keep him working), he was working on the real stuff. HOWEVER, I had a problem pushing – so this link helped with that part. Put them together and here is the final set of commands in my context on my branch … Continue reading

Share Button

Filemaker shows hope for uploading large file – fmAjax? Awesome

I don’t want to upload one record at a time, I want to do them all – so that is like a transaction. It either works or it doesn’t. Here is a genius who has lego’ed a few interesting things together. He uses a webviewer and ajax to communicate files through the temp directory. These might be the droids I was looking for. My question is, can I preemptively put a file in the temp directory and trigger Ajax to upload it somewhere? Here? I will post any updates here… see you soon.

 

Share Button