Git master updated

[optigon]

Just wanted to announce that the dgud's master branch was updated to include rj/preview_dialogs.

Those of you who have branches not yet added to the master should rebase them, fix any conflicts, and push them to your github origin.

To do this properly you should have dgud's github repo added as a remote. To add dgud as a remote, go to your local Wings git directory and run:

Code:

git remote add dgud git://github.com/dgud/wings.git
git fetch dgud

Then checkout one of your branches to be updated:

Code:

git checkout my/branch

Update your branch:

Code:

git rebase dgud/master

Fix conflicts manually if necessary. They are tagged in the source with <<<<<<< (irc). Git walks you through the process, as I remeber... I think you add the changed files and commit the changes.

When the merge conflicts with the current master are resolved, squash you commits into a single commit and add a NOTE.

I believe the procedure in described (and perhaps better) at Bjorn's github in the wiki section. https://github.com/bjorng/wings/wiki/_pages

If Preview Dialogs didn't break your branches the next round of changes might

After you've updated any branches that should be pushed to the master immediatly, list them in this thread for review.

Only list branches that you have personally reviewed in regards to style, merge conflicts, and bugs.

I want to start the next round of changes soon and would like all current changes submitted for review.

Let's do this together so we're all on the same master.