On Mon, 8 Apr 2013, Roy Stogner wrote: > Is there any way to fix the problem, short of destroying and > recreating my fork?
Likewise, is there any way to ensure the problem doesn't recur other than "make sure to never forget when to rebase and when to merge"? "git config branch.master.rebase true" and "git config branch.autosetuprebase always" to tell pulls on the fork to rebase by default? --- 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