Adding here for my own purposes, but may be helpful to others. This rebases to master (or whatever branch) and then squashes all your commits into one commit! Sexy. 🙂
> git fetch --all
> git checkout [master]
> git pull
> git checkout [working branch name]
> git merge-base HEAD [master]
> git reset --soft [hash] e.g.: 43e87200b8375fc5eba022ced353ab2917f2a746
> git status
> git commit -a -m "NOTES"
> git rebase [master]
Note: Only needed if conflicts between branch commit and master
> git add .
> git status
> git rebase --continue
> git diff origin/[working branch name]
> git push -f origin [working branch name]
Adding here for archival purposes. To have Gatling use another directory for simulations (i.e. no need to copy them to the local Gatling folder), use the following:
gatling --simulations-folder <directory-path>
Perfect for analyzing why a ticket you worked on longer than expected, which usually always does! Check it out here!
Quickly, though, they are:
- Partially Done Work
- Extra Features
- Task Switching
Tomcat 7 no longer “explodes” .war files like it used to; however, all you need to do is drop them into the /webapps folder and Tomcat will handle the rest.
In my case, I installed Tomcat via Homebrew, so it’ll be in /usr/local/Cellar/tomcat7/7.0.70/libexec/webapps.
At the time of this writing, Java 9 is in beta. I installed because I wanted to check out jshell, Java’s new REPL (read-evaluate-print-loop). On top of the below, I brew-installed jenv (a must for managing different JDK versions).
$ brew install Caskroom/versions/java9-beta
$ jenv add /Library/Java/JavaVirtualMachines/jdk-9.jdk/Contents/Home
$ jenv shell oracle64-9-ea
$ java -version
java version "9-ea"
Java(TM) SE Runtime Environment (build 9-ea+102-2016-01-21-003129.javare.4316.nc)
Java HotSpot(TM) 64-Bit Server VM (build 9-ea+102-2016-01-21-003129.javare.4316.nc, mixed mode)
| Welcome to JShell -- Version 9-ea
| Type /help for help
-> "Hello JDK 9!"
| Expression value is: "Hello JDK 9!"
| assigned to temporary variable $1 of type String
I also did the following to get jshell to work:
1. Added to ~/.bash_profile
eval "$(jenv init -)"
2. Added my hostname in /etc/hosts
Cheers, and enjoy learning lambdas!