You can just delete those merge commits. I would just do a "git rebase
HEAD~4" (where 4 is 1 beyond the number of commits you want to edit.. you
can also put in a hash that is a couple beyond the commits you want to
edit) and delete the merge commit lines... that will just remove those
patches from your branch.
Then you can do a pull --rebase upstream master and it should sync up fine.
Derek
On Mon, Apr 8, 2013 at 11:16 AM, Roy Stogner <royst...@ices.utexas.edu>wrote:
>
> Is there any way to fix the problem, short of destroying and
> recreating my fork?
> ---
> Roy
>
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
_______________________________________________
Libmesh-devel mailing list
Libmesh-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libmesh-devel
