@Duga Do we actually distribute the GPL in some file with the installer?
Although the GPL is not really an end-user license, I think we are bound to at least distribute it with the binaries because they are derived work of the source code.
> Was it the only astonishing thing in the EULA? 😉
That's by design, since GPL isn't a EULA it makes little sense to make end users "agree" to terms that essentially govern the source code (we did keep the applicable "as-is in the hope it will be useful" part). It was changed last year if I recall correctly.
This is a follow up to VBEMenuButton Class.
After much trial and error I abandoned the previous approach. I decided that it would be better to create a class to instantiate the menus. When the class is terminated the menus are deleted. This only works when the class is properly terminated. Wh...
What do you do with a git merge conflict when the two are so out of sync that they're not matching up in a logical way?
Part of the problem is that I haven't been using it right so my origin is severely out of sync with my actual code.
Which, much to my chagrin, I've been exporting from my Dev Access .accdb file and directly importing into my Prod .accdb file and skipping the proper push/merge/pull, etc.
yes, shot myself in the foot. again.
What I really need to do is tell git "accept what I'm telling you now as the source of truth and forget all the info you had from before because it's seriously out of date".
Well, it's a matter of taking time to look at where your hand holding the gun is pointing to, double checking that the right end of the gun is pointing, and looking beyond the gun to make sure your feet isn't in sight...
@FreeMan this looks like a job for git push --force, assuming your local version is the latest and you want to lose whatever the remote has that your local doesn't. If you can't just overwite the remote... you need to bring in the remote changes somehow... Good luck!
TLDR: If you're the only developer working on your repo, do whatever you want. It's only a problem when you start blasting at a shared repo where other people could lose work.
@HackSlash they usually will not lose work, it will just mean they can't git pull, because git is smort and doesn't like destroying things
well ... or git pull will result in an automatic merge, either borking everything to hell and back or resulting in a conflicting merge and manual merging
and unfortunately most people don't know how to unfuck basic git messes
I find GitExtensions really helps. If they are allergic to command line this would be a better compromise than GHDesktop. (Note: it requires full git installation because it just runs the correct commands for you) gitextensions.github.io
I combine that with WinMerge as the default diff engine: winmerge.org
Using those two tools you can quickly untangle a merge conflict spaghetti western from the comfort of GUI land
If you get in a situation that those tools can't handle, Torvalds help you.
This is a follow up to VBEMenuButton Class.
After much trial and error I abandoned the previous approach. I decided that it would be better to create a class to instantiate the menus. When the class is terminated the menus are deleted. This only works when the class is properly terminated. Wh...
VBA Rubberducking
VBA Rubberducking