Iuri Matos iuriimattos

Encoding Video

Installing

Install FFmpeg with homebrew. You'll need to install it with a couple flags for webm and the AAC audio codec.

brew install ffmpeg --with-libvpx --with-libvorbis --with-fdk-aac --with-opus

How to / Git

Branching strategy

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.

Git Alias and Git Rebase

Make sure you have configured git tools: see configuring tools.

Make sure you have updated git aliases: see how to register aliases.

WHEN TO DO REBASE

After each commit in our branch, in order to be up-to-date with the integration branch.

Merging feature branches with rebase:

git checkout master
git pull --rebase to make sure you have the latest version of master
git checkout feature/my-branch
git rebase master ... to rebase this branch from master
1. Optionally, git push --force to update the branch on github. This is useful for making sure it closes a pull request properly.
git checkout master
git merge --no-ff feature/my-branch ... merge the branch into master, making sure there's a merge commit

In your local clone of your forked repository, you can add the original GitHub repository as a "remote". ("Remotes" are like nicknames for the URLs of repositories - origin is one, for example.) Then you can fetch all the branches from that upstream repository, and rebase your work to continue working on the upstream version. In terms of commands that might look like:

Add the remote, call it "upstream":

git remote add upstream https://github.com/whoever/whatever.git

Fetch all the branches of that remote into remote-tracking branches, such as upstream/master:

git fetch upstream

Checkout a new working branch

 git checkout -b <branchname>

Make Changes

 git add
 git commit -m "description of changes"

Sync with remote

Git alias - seja rápido, seja breve!

Git freak como sou, precisava compartilhar algo útil sobre ele, claro. E, já que não vejo muito por aí o pessoal usando, resolvi falar dos alias do git! É um recurso que eu uso muito, e nunca entendi porque muitas pessoas não são adeptas. 😕

Pelo nome você já deve perceber que os alias no git são atalhos. Atalhos pro quê? São atalhos para comandos do git e até comandos shell se você quiser. E é bem fácil cadastrar um alias:

$ git config --global alias.st status

	<?xml version="1.0" encoding="UTF-8"?>

	<!--
	file-system-maven-settings
	-->

	<!--
	\| This is the configuration file for Maven. It can be specified at two levels:
	\|
	\| 1. User Level. This settings.xml file provides configuration for a single user,

	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