On Tue, Dec 11, 2012 at 4:10 PM, John Peterson <peter...@cfdlab.ae.utexas.edu> wrote:
This workflow is correct, but it isn't complete... > 1.) <finish work on branch_name> > 2.) git pull --rebase > 3.) git co master > 4.) git merge branch_name > 5.) git push In order for the pull --rebase request to work properly, you have to create the branch with the proper tracking in the first place. Hence, please also add a step zero: 0.) git co --track -b branch_name origin/master -- John ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ Libmesh-devel mailing list Libmesh-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/libmesh-devel
