202 Lotus blogs updated hourly. Who will post next? Home | Blogs | Search | About 
 
Latest 7 Posts
Composing With Docker
Thu, Nov 2nd 2017 9
Hacktoberfest and More
Tue, Oct 24th 2017 7
Go Evergreen
Tue, Oct 17th 2017 14
Change is in the Air
Fri, Sep 1st 2017 10
Open Source Contribution
Fri, Jun 16th 2017 8
Docker Quick Tips
Fri, Apr 28th 2017 5
Notes in 9: Dev Tools Grab Bg
Tue, Apr 4th 2017 8
Top 10
Building Java Objects From JSON
Thu, Jan 22nd 2015 15
Go Evergreen
Tue, Oct 17th 2017 14
REST is Best
Wed, Sep 17th 2014 12
Task Runners pt.4
Thu, Dec 17th 2015 12
Everything Old is New Again
Mon, Oct 24th 2016 12
Change is in the Air
Fri, Sep 1st 2017 10
Notes in 9: Docker + SonarQube
Wed, Feb 24th 2016 9
Custom JSON Serialization With GSON
Mon, Jan 23rd 2017 9
Composing With Docker
Thu, Nov 2nd 2017 9
Redmine, CodeRay, and Domino, Oh My!
Sun, Aug 10th 2014 8


Git Squash
Twitter Google+ Facebook LinkedIn Addthis Email Gmail Flipboard Reddit Tumblr WhatsApp StumbleUpon Yammer Evernote Delicious
   

Intro

If you’re just here to learn a little about how to “squash” commits with git, skip down a ways. Otherwise, hold on, and I will catch you up on a couple of personal notes before we get there.

On the Blog

It’s been a little while since I blogged last. This has been due to a combination of reasons; specifically, I’ve been busy with:

  • my family, it was the end of summer with lots of things going on
  • a number of projects around the house (a deck removal and basement remodeling)
  • some personal projects I’ve been working on (software related, )
  • the day job
  • preparing for, and going on, a(n amazing) vacation

On the XPages Platform

There’s one more thing involved, which is a tougher topic. Since MWLUG, there was a bit of a shift from the previous head scratching and beard stroking (for those of us so endowed) regarding the future of platform development of Domino.

For the majority of my history on this blog, I’ve taken an approach to creating and using a “thick” app in the client-side, with a focus on driving the backing data service via RESTful APIs. This is generally how much of the rest of the industry seems to be progressing, insofar as web applications. I’ve been pretty happy that the more modern tooling which optimizes content so far as to minimize the foot print of the built assets that go into an NSF’s WebContent path, and it certainly helps avoid the constraint of the limitation of design elements in an NSF, but while this eases one side of an application, there has been a disturbing amount of quiet for some time, to the point that many have even been quite skittish or outright fearful of the future direction of the Domino and XPages platform. Thankfully, there has finally been a break in the “radio silence” from IBM on the future of the development of the Domino/XPages platform. This isn’t to say the world is perfect, but I’m trying to keep focused on the positives.

Instead of looking for all the relevant links to list out here myself, I’m going to blatantly share a link to Johnny Oldenburger’s blog post laying out a nice summary, “The Future of IBM Notes Domino and XPages Revealed ?”. The short version is to the effect of:

  • there is a road map
  • the “versioning” of Domino is switching from semver-like to feature packs*
  • some needed updates are coming (including an update to the JVM for 1.8, currently slated for Q1 2017 in FP8)

* As an aside, the shift to a rolling release mechanism has greatly helped one of our large projects at my day job. I still assign a version to the the release, but that’s for internal tracking. The reduction in emphasis on monolithic style releases has aided our flexibility (and generally our sanity).

Git Squash

For starters, I’m not talking about the family of fruit (including pumpkins and other gourds) or the game often found adjacent to racquetball courts.

There comes a time on occasion, due to preference or rules of others (like in a Pull Request), that a developer may wish to “squash” their commits. This is, strictly speaking, just a git rebase going back n commits, to make the total summary of changes fit into a single commit. Essentially, you’re making the commit history “easier to read” for the accepted changes and comes up more often in large code bases, especially with git repositories where people tend to perform a rebase instead of merge or squash merge, instead of just a merge.

Once you have identified the number of commits back to ‘squash’, then you can run git rebase -i HEAD~n. You’ll be “cherry picking” the commits to squash, so make sure it looks right before proceeding. When done, “save”, then it’ll prompt you to confirm the commit message; by default it brings them all into one.

Asciicast

If the asciicast gives you trouble (possibly on mobile), just take this link.

IBM Champion Nominations

The IBM Champion program is now accepting nominations in Social Business, Power Systems, Analytics, and Cloud. The IBM developerWorks page has a pretty thorough breakdown of what the IBM Champion program is about. The general idea is that a qualified person is a non-IBMer, who makes exceptional contributions to the community, including accessibility to the community through various engagements (such as speaking at conferences, blogging, being active in forums, etc.).

If you feel you know someone who deserves to be nominated, especially if someone has assisted you from the community, please fill out the nomination form.

Nomination form link!

Hacktoberfest

In case you missed it, Hacktoberfest 2016 is under way! If you haven’t already, all you need is 4 Pull Requests on GitHub to get there. If you’re looking to contribute on a project, you may know of one that is more than willing to take on some PRs. :wink:

Seriously, if you’re interested in and are looking to contribute to my XPages compatible Yeoman generator, “generator-xsp”, I am more than happy to bring others in to contribute. I have some general guidelines and a few ideas for a couple additional features.

Summary

As always, thanks for reading. :beers:



---------------------
https://edm00se.io/scm/git-squash-and-update/
Oct 20, 2016
9 hits



Recent Blog Posts
9
Composing With Docker
Thu, Nov 2nd 2017 2:00p   Eric McCormick
Background About a year ago, I blogged on automating server upgrades with Docker and a BASH script. This met the needs I had at the time, and worked itself out to be pretty stable. But, since I think about such things and always question my preconceptions, I went down a path of creating a Docker compose config file, something I wouldn’t have had to create from scratch by waiting a little while as one appeared as an example from GitLab. As it turns it, it was a great learning experience regardl
7
Hacktoberfest and More
Tue, Oct 24th 2017 2:00p   Eric McCormick
Hacktoberfest 2017 October brings many good things with it. It’s the beginning of autumnal colors here, along with some yard raking in my case. It also brings with it not just Oktoberfest, but Hacktoberfest! Hacktoberfest 2017 Hacktoberfest is a month long open source support initiative, sponsored by Digital Ocean, partnering with GitHub. It’s meant to promote open source involvement and contribution. As added incentive, if you meet the criteria, you can get a free t-shirt (and stickers).
14
Go Evergreen
Tue, Oct 17th 2017 4:00p   Eric McCormick
Happy 🎂 Day IE 11! On the 17th of October in 2013, Internet Explorer 11 was released from Microsoft. That means that as of today, this popular* browser is now four years old and, with all respect to it, it really ought to go. Good day sir. I said good day! Evergreen Browsers What makes a browser, or any software for that matter, evergreen? Well, the basic requirements for a browser, or any piece of software for that matter, are specifically the support of automatic updates, that bring in:
10
Change is in the Air
Fri, Sep 1st 2017 1:00p   Eric McCormick
I’m Back What Can I Say? In Case You Missed It If you find yourself asking “where was Eric?”, this should summarize it all: Instead of trying to do everything all summer, I tend to take a break from blogging and a lot of open source endeavors over the summer. It means I can focus on family time along with yard and house projects. Ah... Summer That’s all paid off and, with fall fast approaching, I’ve found myself wanting to start those things back up; ramping up into winter when
8
Open Source Contribution
Fri, Jun 16th 2017 5:00p   Eric McCormick
Intro It’s time to clear some of the backlog. I started this post a few months back and it should probably be sent on its way to clear the pile of drafts I haven’t finished yet… 🤔 I have a bit of a passion for open source software. My preferred distribution of Linux has been Ubuntu since 4.10, the Warty Warthog (I was even a minor contributor on a short lived, wildly popular project that aimed at improving the Ubuntu experience early on), I’ve enjoyed most open source projects I’ve
5
Docker Quick Tips
Fri, Apr 28th 2017 3:00p   Eric McCormick
Docker If you have been living under a rock, Docker is pretty much amazing. If you haven’t been living under a rock, you may be getting used to the idea of Docker, but still have the occasional question. I’ve found myself using Docker in increasing amounts and complexity over the last year or so. I’ve recently decided to start recording some of the tasks I’ve found useful, some of which may be less familiar to a beginner. If you’re so inclined, check out the playlist, embedded here.
8
Notes in 9: Dev Tools Grab Bg
Tue, Apr 4th 2017 1:00p   Eric McCormick
Intro I’m on Notes in 9 again, with a “grab bag” of a couple of tools I’ve put together recently that may be of a varying degree of useful for other Domino + XPages developers. You don’t need these to do development, but for the right person, they may help with their development workflow. Also of note, with the upgrade to Swiper with the FP8 release of Notes + Domino Designer, the limitations previously mentioned are no longer there! This means that my second tool I talked about, node-
9
Custom JSON Serialization With GSON
Mon, Jan 23rd 2017 2:00p   Eric McCormick
Intro Here’s a curious one, in which I found myself with a limitation of not being able to output JSON with scientific notation values. wait, what? If you’re wondering why that is, since both JSON and JavaScript allow scientific notation of number values, you are absolutely correct and that’s a great question. The strange thing was that I found myself outputting perfectly valid JSON to be consumed by something specific which didn’t allow scientific notation. I’m not entirely sure wh
8
Recapping 2016
Mon, Jan 16th 2017 3:00p   Eric McCormick
Intro Per usual, I’ve had a little break between things and decided to catch up with a bit of a summary of some recent things that each didn’t necessitate their own post. 2017 IBM Champion For starters, I’m honored to be named an IBM Champion in Collaboration Solutions (/ Social Business) for the third time. This would be a hat trick in (ice) hockey 🏒. I’m happy to be recognized with a group of people, developers and more, who are passionate about both their work and the plat
0
Scripting Server Upgrades
Fri, Nov 11th 2016 12:00a   Eric McCormick
Intro This one might be slight departure from my usual, but those that have followed my blogging this past year will have noticed a bit more of a leaning towards DevOps in some of my posts. This echoes a lot of what I’ve been concluding as increasingly a necessary part of development; that we need to consider a picture large enough to encompass the themes surrounding development functions and, like any good developer (DRY ~= “lazy”), automate the heck out of it. Overview I had previously




Created and Maintained by Yancy Lent - About - Planet Lotus Blog - Advertising - Mobile Edition