Alex wrote: > - When need knocks the door, we merge upstream into master, where our > local changes happens;
We will need to be careful about this not to undo the changes we need for ourselves, for instance re-introducing a binary rebar or clobbering our .travis files as you point out. As such merging upstream should be done into another branch where work is done and a PR is issued before we merge *that* branch into master. -Joan
