Popular:
 Building Resilient Systems on AWS: Learn how to design and implement a resilient, highly available, fault-tolerant infrastructure on AWS.

Create a GitHub Merge Batch File

By  on  

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:

  1. Going out to GitHub, grabbing the current "Core", and putting it into a branch called "coco."
  2. Merging it with my current local copy.
  3. 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.

Request Metrics real user monitoring
Request Metrics real user monitoring
Request Metrics real user monitoring
Request Metrics real user monitoring

Recent Features

Incredible Demos

  • By
    CSS :target

    One interesting CSS pseudo selector is :target.  The target pseudo selector provides styling capabilities for an element whose ID matches the window location's hash.  Let's have a quick look at how the CSS target pseudo selector works! The HTML Assume there are any number of HTML elements with...

  • By
    MooTools Clipboard Plugin

    The ability to place content into a user's clipboard can be extremely convenient for the user. Instead of clicking and dragging down what could be a lengthy document, the user can copy the contents of a specific area by a single click of a mouse.

Discussion

  1. Chris

    do once:
    git remote add mootools git://github.com/mootools/mootools-core.git

    then do:
    git pull mootools master

    done.

  2. Matt

    Ha Chris . .beat me too it!

    And yeah, the above would be a lot easier

    /Matt

  3. David Walsh

    Thanks for the tip Chris and Matt!

  4. Eric Wendelin

    Way to automate, David :)

  5. David Walsh

    Laziness FTW!

  6. Aaron Newton

    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…

  7. David Walsh

    @Aaron Newton: Good call. Removed from my local file.

  8. fabiomcosta

    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.

Wrap your code in <pre class="{language}"></pre> tags, link to a GitHub gist, JSFiddle fiddle, or CodePen pen to embed!