gistfile1.sh

# When taking contributions, always make sure that the contributor's work allows for a "fast forward" merge.
# That is, their changes "start" at the current FubuMVC master branch (HEAD) and thus will not cause merge
# conflicts.
# If that is not the case, do not take the contribution and ask the contributor to "rebase" against the FubuMVC
# master, loading the merge work off to the contributor.
# Also, see here: http://gitcasts.com/posts/distributed-workflow (also see the second comment)

# Add a remote for my fork
git remote add agross git://github.com/agross/FubuMVC.git

# Fetch my changes so you have them locally, but not (yet) in your source tree
git fetch agross

# Create a new integration branch "agross-master" from my master branch
git checkout -b agross-master agross/master

# Review the integration branch...
# You may decide which commits to take as-is/squash/edit/remove
# git rebase --interactive <commitish-to-start-editing - 1>

# Merge the changes from the integration branch. This should resolve to a "fast forward" 
# if I'm on top of you master branch, which makes your life easy, i. e. no merge conflicts will occur.
# Move to master branch
git checkout master
# Will take all of the commits in the integration branch
git merge agross-master

# If also you want to merge the Castle branch, use this branch: agross/castle-ioc

# Push your updated master branch to GitHub
git push master