On Tue, Dec 11, 2012 at 2:21 PM, John Peterson <peter...@cfdlab.ae.utexas.edu> wrote: > On Mon, Dec 10, 2012 at 5:04 PM, Kirk, Benjamin (JSC-EG311) > <benjamin.kir...@nasa.gov> wrote: >> libMesh users & developers: >> > Then the work flow is as follows: > > 1.) <finish work on branch_name> > 2.) git co master > 3.) git fetch > 4.) git merge origin/master > 5.) git co branch_name > 6.) git rebase master > 7.) git co master > 8.) git merge branch_name > 9.) git push
As you might have hoped, this process can be simplified somewhat! Let's say you have made some commits on a branch named branch_name, it's currently checked out, and you want to pull down the most recent changes from github (similar to an svn up). You'd then just do git pull --rebase I should note that this is slightly dangerous. It can fail if there are any conflicts, and I don't have enough experience to describe the process of fixing those and continuing on (but I will test that now). So the workflow above becomes: 1.) <finish work on branch_name> 2.) git pull --rebase 3.) git co master 4.) git merge branch_name 5.) git push -- 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
