Hi,
Now that we are wrapping up Release 2.0 of Trafodion, just wanted to remind committers (well, and developers too) to pay attention to which branches they are dealing with when making any final changes. When committing a change, be careful to note what branch you are committing into. For example, in PR 454 ( https://github.com/apache/incubator-trafodion/pull/454) Venkat wants to put a fix into Release 2.0, not into the master branch. If you are following the merge instructions here https://cwiki.apache.org/confluence/display/TRAFODION/Merge+Changes#MergeChanges-MergePullRequests you must mentally replace “master” with “release2.0” everywhere in the git commands. If you don’t do this, you’ll probably notice more commits than you bargained for at the step “git log apache/master..HEAD”, or more differences than intended when doing “git diff apache/master HEAD”. Why do I bring this up? I nearly made this mistake this morning, with Venkat’s change. Being too mechanical in my early morning sleepiness I suppose. I got to the “git log” step and noticed there was extra stuff, which gave me a clue. Fortunately I didn’t proceed to a “git push”, so no harm done. So, to recover, I started over on a fresh branch, based off of apache/release2.0. Thanks, Dave
