Terminal log of my attempts to merge lagunitas branch into my tajo branch and ensure everything is up to date both locally and in my origin github user repo.

gistfile1.txt

### ** From my first terminal window which was dealing with my local copy of the lagunitas branch. **

[1001][me@xxx: ~]$ cd src/mondrian-lagunitas/

[1001][me@xxx: mondrian-lagunitas (lagunitas)]$ git status
On branch lagunitas
nothing to commit, working directory clean

[1004][me@xxx: mondrian-lagunitas (lagunitas)]$ git log
commit 24b9fc2c84031bce388b5aa4f63684229c96d625

[1005][me@xxx: mondrian-lagunitas (lagunitas)]$ git pull
Already up-to-date.

[1006][me@xxx: mondrian-lagunitas (lagunitas)]$ git pull upstream
CONFLICT (modify/delete): workbench/workbench.bat deleted in HEAD and modified in 40a7b4ac3fd90c93004a3501a80ef57d8d5e26c9. Version 40a7b4ac3fd90c93004a3501a80ef57d8d5e26c9 of workbench/workbench.bat left in tree.
### ** Lots more conflicts.  later determined that I was accidentally trying to pull and merge *master* into this branch. **
[1007][me@xxx: mondrian-lagunitas (lagunitas *+|MERGING)]$ git status
On branch lagunitas
You have unmerged paths.
  (fix conflicts and run "git commit")

[1008][me@xxx: mondrian-lagunitas (lagunitas *+|MERGING)]$ git reset --hard upstream
HEAD is now at 24b9fc2 Merge pull request #213 from mkambol/mon1844
[1009][me@xxx: mondrian-lagunitas (lagunitas)]$ git log
commit 24b9fc2c84031bce388b5aa4f63684229c96d625

[1011][me@xxx: mondrian-lagunitas (lagunitas)]$ git remote -v
origin	[email protected]:DEinspanjer/mondrian.git (fetch)
origin	[email protected]:DEinspanjer/mondrian.git (push)
upstream	[email protected]:pentaho/mondrian.git (fetch)
upstream	I shouldn't push to upstream remotes. (push)

[1012][me@xxx: mondrian-lagunitas (lagunitas)]$ git pull upstream lagunitas
From github.com:pentaho/mondrian
 * branch            lagunitas  -> FETCH_HEAD
Already up-to-date.

[1013][me@xxx: mondrian-lagunitas (lagunitas)]$ git push origin
fatal: The current branch lagunitas has no upstream branch.
To push the current branch and set the remote as upstream, use

    git push --set-upstream origin lagunitas

[1016][me@xxx: mondrian-lagunitas (lagunitas)]$ git push origin lagunitas
Counting objects: 291, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (82/82), done.
Writing objects: 100% (89/89), 11.65 KiB | 0 bytes/s, done.
Total 89 (delta 59), reused 0 (delta 0)
To [email protected]:DEinspanjer/mondrian.git
   3a09ced..24b9fc2  lagunitas -> lagunitas

[1017][me@xxx: mondrian-lagunitas (lagunitas)]$ git pull
Already up-to-date.

[1018][me@xxx: mondrian-lagunitas (lagunitas)]$ git pull origin lagunitas
From github.com:DEinspanjer/mondrian
 * branch            lagunitas  -> FETCH_HEAD
Already up-to-date.

[1019][me@xxx: mondrian-lagunitas (lagunitas)]$ git pull
Already up-to-date.

[1020][me@xxx: mondrian-lagunitas (lagunitas)]$ git status
On branch lagunitas
nothing to commit, working directory clean

[1021][me@xxx: mondrian-lagunitas (lagunitas)]$ git fetch origin
[1022][me@xxx: mondrian-lagunitas (lagunitas)]$ git fetch upstream
[1023][me@xxx: mondrian-lagunitas (lagunitas)]$ git merge upstream/lagunitas
Already up-to-date.



### ** Here is the terminal log from the other window, focused on operations in the tajo branch **

[1030][me@xxx: src]$ cd mondrian-tajo

[1030][me@xxx: mondrian-tajo (tajo *+)]$ git status
On branch tajo
Your branch is based on 'lagunitas', but the upstream is gone.
  (use "git branch --unset-upstream" to fixup)

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	new file:   src/main/mondrian/queryplan/QueryPlan.java
	new file:   src/main/mondrian/queryplan/QueryPlanner.java

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   doc/configuration.html
	modified:   intellij/mondrian.iml
	modified:   intellij/mondrian.ipr
	modified:   src/main/mondrian/queryplan/QPResult.java
	modified:   src/main/mondrian/queryplan/QueryPlan.java
	modified:   src/main/mondrian/queryplan/QueryPlanner.java
	modified:   src/main/mondrian/rolap/RolapConnection.java
	modified:   src/main/mondrian/rolap/RolapConnectionProperties.java
	modified:   src/main/mondrian/rolap/RolapSchema.java
	modified:   testsrc/main/mondrian/test/SteelWheelsSchemaTest.java

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	intellij/tajo-algebra.iml
	intellij/tajo-catalog-client.iml
	intellij/tajo-catalog-common.iml
	intellij/tajo-catalog-server.iml
	intellij/tajo-client.iml
	intellij/tajo-common.iml
	intellij/tajo-core-backend.iml
	intellij/tajo-core-pullserver.iml
	intellij/tajo-core-storage.iml
	intellij/tajo-dist.iml
	intellij/tajo-hcatalog.iml
	intellij/tajo-jdbc.iml
	intellij/tajo-rpc.iml

[1031][me@xxx: mondrian-tajo (tajo *+)]$ git add intellij/*
The following paths are ignored by one of your .gitignore files:
intellij/mondrian.iws
Use -f if you really want to add them.
fatal: no files added

[1032][me@xxx: mondrian-tajo (tajo *+)]$ git add intellij/tajo*

[1033][me@xxx: mondrian-tajo (tajo *+)]$ git status
On branch tajo
Your branch is based on 'lagunitas', but the upstream is gone.
  (use "git branch --unset-upstream" to fixup)

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	new file:   intellij/tajo-algebra.iml
	new file:   intellij/tajo-catalog-client.iml
	new file:   intellij/tajo-catalog-common.iml
	new file:   intellij/tajo-catalog-server.iml
	new file:   intellij/tajo-client.iml
	new file:   intellij/tajo-common.iml
	new file:   intellij/tajo-core-backend.iml
	new file:   intellij/tajo-core-pullserver.iml
	new file:   intellij/tajo-core-storage.iml
	new file:   intellij/tajo-dist.iml
	new file:   intellij/tajo-hcatalog.iml
	new file:   intellij/tajo-jdbc.iml
	new file:   intellij/tajo-rpc.iml
	new file:   src/main/mondrian/queryplan/QueryPlan.java
	new file:   src/main/mondrian/queryplan/QueryPlanner.java

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   doc/configuration.html
	modified:   intellij/mondrian.iml
	modified:   intellij/mondrian.ipr
	modified:   src/main/mondrian/queryplan/QPResult.java
	modified:   src/main/mondrian/queryplan/QueryPlan.java
	modified:   src/main/mondrian/queryplan/QueryPlanner.java
	modified:   src/main/mondrian/rolap/RolapConnection.java
	modified:   src/main/mondrian/rolap/RolapConnectionProperties.java
	modified:   src/main/mondrian/rolap/RolapSchema.java
	modified:   testsrc/main/mondrian/test/SteelWheelsSchemaTest.java

[1035][me@xxx: mondrian-tajo (tajo *+)]$ git add -A
[1036][me@xxx: mondrian-tajo (tajo +)]$ git status
On branch tajo
Your branch is based on 'lagunitas', but the upstream is gone.
  (use "git branch --unset-upstream" to fixup)

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	modified:   doc/configuration.html
	modified:   intellij/mondrian.iml
	modified:   intellij/mondrian.ipr
	new file:   intellij/tajo-algebra.iml
	new file:   intellij/tajo-catalog-client.iml
	new file:   intellij/tajo-catalog-common.iml
	new file:   intellij/tajo-catalog-server.iml
	new file:   intellij/tajo-client.iml
	new file:   intellij/tajo-common.iml
	new file:   intellij/tajo-core-backend.iml
	new file:   intellij/tajo-core-pullserver.iml
	new file:   intellij/tajo-core-storage.iml
	new file:   intellij/tajo-dist.iml
	new file:   intellij/tajo-hcatalog.iml
	new file:   intellij/tajo-jdbc.iml
	new file:   intellij/tajo-rpc.iml
	modified:   src/main/mondrian/queryplan/QPResult.java
	new file:   src/main/mondrian/queryplan/QueryPlan.java
	new file:   src/main/mondrian/queryplan/QueryPlanner.java
	modified:   src/main/mondrian/rolap/RolapConnection.java
	modified:   src/main/mondrian/rolap/RolapConnectionProperties.java
	modified:   src/main/mondrian/rolap/RolapSchema.java
	modified:   testsrc/main/mondrian/test/SteelWheelsSchemaTest.java

[1040][me@xxx: mondrian-tajo (tajo +)]$ git commit 
[tajo 47736da] Query planner changes to support most single axis queries
 23 files changed, 3388 insertions(+), 71 deletions(-)
 create mode 100644 intellij/tajo-algebra.iml
 create mode 100644 intellij/tajo-catalog-client.iml
 create mode 100644 intellij/tajo-catalog-common.iml
 create mode 100644 intellij/tajo-catalog-server.iml
 create mode 100644 intellij/tajo-client.iml
 create mode 100644 intellij/tajo-common.iml
 create mode 100644 intellij/tajo-core-backend.iml
 create mode 100644 intellij/tajo-core-pullserver.iml
 create mode 100644 intellij/tajo-core-storage.iml
 create mode 100644 intellij/tajo-dist.iml
 create mode 100644 intellij/tajo-hcatalog.iml
 create mode 100644 intellij/tajo-jdbc.iml
 create mode 100644 intellij/tajo-rpc.iml
 create mode 100644 src/main/mondrian/queryplan/QueryPlan.java
 create mode 100644 src/main/mondrian/queryplan/QueryPlanner.java

[1042][me@xxx: mondrian-tajo (tajo)]$ git remote -v
origin	[email protected]:DEinspanjer/mondrian.git (fetch)
origin	[email protected]:DEinspanjer/mondrian.git (push)
upstream	[email protected]:pentaho/mondrian.git (fetch)
upstream	I shouldn't push to upstream remotes. (push)

[1043][me@xxx: mondrian-tajo (tajo)]$ git push origin
Counting objects: 142, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (35/35), done.
Writing objects: 100% (36/36), 23.58 KiB | 0 bytes/s, done.
Total 36 (delta 23), reused 0 (delta 0)
To [email protected]:DEinspanjer/mondrian.git
   bb134f3..47736da  tajo -> tajo

#####  This was done after I had successfully merged and pushed the upstream lagunitas changes to my origin fork
[1045][me@xxx: mondrian-tajo (tajo)]$ git fetch origin lagunitas
From github.com:DEinspanjer/mondrian
 * branch            lagunitas  -> FETCH_HEAD
[1046][me@xxx: mondrian-tajo (tajo)]$ git help merge
[1047][me@xxx: mondrian-tajo (tajo)]$ git merge lagunitas
Auto-merging src/main/mondrian/rolap/RolapSchema.java
Merge made by the 'recursive' strategy.
 bin/checkFile.awk                                             | 30 ++++++++++++++++++++++++------
 build.xml                                                     | 27 +++++++++++++++++++++------
 ivy.xml                                                       | 13 +++++++++----
 mondrian.bnd                                                  |  5 +++++
 src/main/OSGI-INF/blueprint/beans.xml                         | 34 ++++++++++++++++++++++++++++++++++
 src/main/mondrian/i18n/LocalizingDynamicSchemaProcessor.java  |  5 ++---
 src/main/mondrian/olap/fun/BuiltinFunTable.java               |  4 ++--
 src/main/mondrian/olap/fun/DrilldownLevelTopBottomFunDef.java | 10 ++++------
 src/main/mondrian/olap/fun/NativizeSetFunDef.java             |  5 ++---
 src/main/mondrian/olap4j/MondrianOlap4jCellSet.java           | 10 +++++-----
 src/main/mondrian/olap4j/MondrianOlap4jMember.java            |  4 +++-
 src/main/mondrian/osgi/PropertiesService.java                 | 31 +++++++++++++++++++++++++++++++
 src/main/mondrian/rolap/RolapCubeLevel.java                   | 12 ++++++------
 src/main/mondrian/rolap/RolapMember.java                      |  3 +++
 src/main/mondrian/rolap/RolapSchema.java                      | 11 ++++++++++-
 src/main/mondrian/rolap/RolapSchemaLoader.java                |  4 ++--
 src/main/mondrian/rolap/RolapSchemaUpgrader.java              | 10 +++++-----
 src/main/mondrian/rolap/SqlConstraintUtils.java               |  4 ++--
 src/main/mondrian/rolap/agg/SegmentLoader.java                |  5 +++--
 src/main/mondrian/spi/impl/JdbcStatisticsProvider.java        |  6 +++---
 src/main/mondrian/tui/XmlUtil.java                            |  4 ++--
 src/main/mondrian/util/ClassResolver.java                     | 11 ++++++++++-
 src/main/mondrian/util/UnsupportedList.java                   |  9 ++++-----
 src/main/mondrian/web/taglib/ResultCache.java                 |  4 ++--
 testsrc/main/mondrian/olap/fun/vba/VbaTest.java               |  4 ++--
 testsrc/main/mondrian/rolap/aggmatcher/DefaultRuleTest.java   |  8 +++-----
 testsrc/main/mondrian/test/BasicQueryTest.java                | 58 +++++++++++++++++++++++++++++-----------------------------
 testsrc/main/mondrian/test/DialectTest.java                   | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 testsrc/main/mondrian/test/PerformanceTest.java               |  6 +++---
 testsrc/main/mondrian/test/SchemaTest.java                    | 22 +++++++++++-----------
 testsrc/main/mondrian/test/loader/MondrianFoodMartLoader.java | 20 ++++++++++----------
 testsrc/main/mondrian/util/BlockingHashMapTest.java           |  6 +++---
 testsrc/main/mondrian/util/ObjectPoolTest.java                |  8 ++++----
 33 files changed, 327 insertions(+), 134 deletions(-)
 create mode 100644 mondrian.bnd
 create mode 100644 src/main/OSGI-INF/blueprint/beans.xml
 create mode 100644 src/main/mondrian/osgi/PropertiesService.java

[1048][me@xxx: mondrian-tajo (tajo)]$ git status
On branch tajo
Your branch is based on 'lagunitas', but the upstream is gone.
  (use "git branch --unset-upstream" to fixup)

nothing to commit, working directory clean

[1049][me@xxx: mondrian-tajo (tajo)]$ git log
commit b424a6a2ee1f3e26af3f8e45b5a1aa5775d86d82
Merge: 47736da 24b9fc2
Author: Daniel Einspanjer <[email protected]>
Date:   Fri Jan 17 10:46:15 2014 -0500

    Merge branch 'lagunitas' into tajo

commit 47736dadd27d42733d9d882f6df0140b1ee03b92
Author: Daniel Einspanjer <[email protected]>
Date:   Fri Jan 17 10:29:30 2014 -0500

    Query planner changes to support most single axis queries


[1054][me@xxx: mondrian-tajo (tajo)]$ git push origin tajo
Counting objects: 95, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (12/12), 1.46 KiB | 0 bytes/s, done.
Total 12 (delta 7), reused 0 (delta 0)
To [email protected]:DEinspanjer/mondrian.git
   47736da..b424a6a  tajo -> tajo

[1055][me@xxx: mondrian-tajo (tajo)]$ git status
On branch tajo
Your branch is based on 'lagunitas', but the upstream is gone.
  (use "git branch --unset-upstream" to fixup)

nothing to commit, working directory clean

[1056][me@xxx: mondrian-tajo (tajo)]$ git branch -v
  lagunitas  24b9fc2 Merge pull request #213 from mkambol/mon1844
  master     40a7b4a Merge pull request #201 from mkambol/mon1694
  mongolap   18ac99a Merge pull request #192 from kurtwalker/MONDRIAN-1771
  old_master 40a7b4a Merge pull request #201 from mkambol/mon1694
* tajo       b424a6a Merge branch 'lagunitas' into tajo
  unitfixes  2029017 Merge pull request #155 from kurtwalker/MONDRIAN-1728

[1057][me@den: mondrian-tajo (tajo)]$ git status
On branch tajo
Your branch is based on 'lagunitas', but the upstream is gone.
  (use "git branch --unset-upstream" to fixup)

nothing to commit, working directory clean