- Make sure you have configured git tools: see configuring tools.
- Make sure you have updated git aliases: see how to register aliases.
After each commit in our branch, in order to be up-to-date with the integration branch.
# custom Android Studio VM options, see https://developer.android.com/studio/intro/studio-config.html | |
# Initial stack memory size, affects idea start speed | |
-Xms4G | |
# Maximum heap memory size that Android Studio can use, reduces the garbage collection frequency. | |
-Xmx8G | |
# Initial Permanent generation | |
-XX:PermSize=2048M |
# custom WebStorm VM options, this configuration also works well for other IDEs like phpstorm, pycharm..etc. | |
-Xms1024m | |
-Xmx2048m | |
-XX:ReservedCodeCacheSize=240m | |
-XX:+UseConcMarkSweepGC | |
-XX:SoftRefLRUPolicyMSPerMB=50 | |
-ea | |
-Dsun.io.useCanonCaches=false | |
-Djava.net.preferIPv4Stack=true |
- Make sure you have configured git tools: see configuring tools.
- Make sure you have updated git aliases: see how to register aliases.
After each commit in our branch, in order to be up-to-date with the integration branch.
We use a form of Git flow to maintain a stable master
branch, and work off feature branches to introduce new features and other code updates. The feature branches are tied to JIRA tickets.
To keep our git log clean and tidy we use git's rebase strategy. That means that instead of merging commits in and out of the master branch (resulting in many ugly merge commits) we always keep our own feature branch's commits on top of the existing master branch commits.
You can read more about the rebase strategy here: https://www.atlassian.com/git/tutorials/merging-vs-rebasing.
ACP notes: https://gist.github.com/djangofan/a8b3e82e585525467c454515a8fb9ecf | |
Practice Tests $9.99: http://enthuware.com/index.php/ocpjp-8-average-scores | |
Guided Practice $140: http://www.ucertify.com/exams/Oracle/1Z0-809.html | |
Transcender: https://www.transcender.com/premium-solution/oracle/1z0-809.kap | |
Remember: javac -Xprint package.classname | |
https://ocpjava.wordpress.com/presentations/ | |
http://www.java2s.com/Tutorials/Java/java.util.stream/Collectors/ !! STUDY THIS!!! | |
https://github.com/eugenp/tutorials/tree/master/core-java | |
https://www.slideshare.net/ibrahimkurce/oca-java-se-8-exam-chapter-6-exceptions | |
https://docs.oracle.com/javase/8/docs/api/java/util/function/class-use/BiPredicate.html |
git remote add upstream https://github.com/whoever/whatever.git
git fetch upstream
At some point you’ll find yourself in a situation where you need edit a commit message. That commit might already be pushed or not, be the most recent or burried below 10 other commits, but fear not, git has your back 🙂.
git commit --amend
This will open your $EDITOR
and let you change the message. Continue with your usual git push origin master
.
/** | |
* Detects if two elements are colliding | |
* | |
* Credit goes to BC on Stack Overflow, cleaned up a little bit | |
* | |
* @link http://stackoverflow.com/questions/5419134/how-to-detect-if-two-divs-touch-with-jquery | |
* @param $div1 | |
* @param $div2 | |
* @returns {boolean} | |
*/ |