Re: [forge-dev] Some incorrect changes to JSF scaffolding?

First of all, always use a branch to create pull requests, this makes it a lot easier to work on several things at a time without getting messy commits. To fix your current changeset you could create a new branch from master (without your changes) and re-apply your changes by either "cherry-picking" them or merging your existing branch into your new branch. Now squash commits by using interactive rebase (http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html). You should never do this after you pushed to a remote location, but because this is a new branch it's perfectly fine. When you're happy with the changeset, push the branch to your github repo, and create a pull request from that branch. Just close the messy pull-request, it's probably easier to start clean. Hope that helps :-) Paul On May 1, 2012, at 22:12 , Thomas Frühbeck wrote: