On Mon, Dec 10, 2012 at 5:04 PM, Kirk, Benjamin (JSC-EG311) <benjamin.kir...@nasa.gov> wrote: > libMesh users & developers: > > Effective immediately, we are moving our development source tree to GitHub. > > https://github.com/libMesh/libmesh > > You can check out the current source tree via > > $ git clone https://github.com/libMesh/libmesh.git > > Future file releases will occur through the GitHub files mechanism, and we > will be moving all forum and tickets to their interface as well. > > The libMesh sourceforge website and mailing lists will be maintained for the > foreseeable future. > > Due to some unexpected technical difficulties, this move was more sudden than > we anticipated. As such, the installation documentation is in the process of > being updated to reflect new best practices - I will follow up with more > details shortly, but wanted to let everyone know that as of now the libMesh > development trunk is moving!
Before things get super-crazy with git, I thought I'd comment on what a developer's workflow (with write access) can be. (Note that this is not the *only* way to work with git, but it will maintain a linear history, which is similar to SVN, and is recommended by our local git guru David Andrs.) The following assumes that you are already using branches for your work, and not working directly in master. To create a branch, you can do "git co -b branch_name" and start making commits to it. 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 Notes: .) Steps 2-4 pull down the most recent changes from github, and merge them onto your local master branch. Steps 3 and 4 can be combined into one command, 'git pull' .) Steps 5-6 "rebase" your patches on top of the most recent changes from github. At this point you can end up with conflicts you'll need to resolve. (See techniques for resolving conflicts, and 'git rebase --continue'.) On the other hand, if nothing new was pulled down in steps 2-4, there will be no work to do. .) Steps 7-9 merge the changes from your branch back into the main line and finally push them all back to github. The next time someone does a 'fetch', they'll pull down these changes... -- 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
