Create a GitHub Merge Batch File
Before I start updating my local clone of the MooTools More or Core libraries, I need to update to the most current version on GitHub. Call me lazy, but I'm tired of typing the commands lines into msysgit all the time. I've created a batch file that does the work for me.
The Batch Script
git fetch git://github.com/mootools/mootools-core.git master:coco
git merge coco
What I'm doing is:
- Going out to GitHub, grabbing the current "Core", and putting it into a branch called "coco."
- Merging it with my current local copy.
Pushing it to my GitHub account.
I know that's not a lot to type, but this script lets me move things along a tiny bit faster. The "push" updates my repository at GitHub right away too. It's also probably important to mention that my operating system is Windows XP.
![CSS 3D Folding Animation]()
Google Plus provides loads of inspiration for front-end developers, especially when it comes to the CSS and JavaScript wonders they create. Last year I duplicated their incredible PhotoStack effect with both MooTools and pure CSS; this time I'm going to duplicate...
![39 Shirts – Leaving Mozilla]()
In 2001 I had just graduated from a small town high school and headed off to a small town college. I found myself in the quaint computer lab where the substandard computers featured two browsers: Internet Explorer and Mozilla. It was this lab where I fell...
![jQuery Comment Preview]()
I released a MooTools comment preview script yesterday and got numerous requests for a jQuery version. Ask and you shall receive! I'll use the exact same CSS and HTML as yesterday.
The XHTML
The CSS
The jQuery JavaScript
On the keypress and blur events, we validate and...
![JavaScript Canvas Image Conversion]()
At last week's Mozilla WebDev Offsite, we all spent half of the last day hacking on our future Mozilla Marketplace app. One mobile app that recently got a lot of attention was Instagram, which sold to Facebook for the bat shit crazy price of one...
do once:
git remote add mootools git://github.com/mootools/mootools-core.git
then do:
git pull mootools master
done.
Ha Chris . .beat me too it!
And yeah, the above would be a lot easier
/Matt
Thanks for the tip Chris and Matt!
Way to automate, David :)
Laziness FTW!
I think this is mildly dangerous. Whenever you merge w/ another codebase you should ensure that the chnaged files are updating things you want. But it’s not uncommon for the changes to create merge conflicts. Having the push in your batch file means that you’re going to try and push those changes without the opportunity to review them.
For what it’s worth, I prefer to use rebase instead of merge when I can…
@Aaron Newton: Good call. Removed from my local file.
You could make a little tutorial on how to checkout, merge, commit stuff to the mootools project hehe, i would be one to appreciate it.
Thanks for sharing.