On Dec 11, 2012, at 6:14 PM, John Peterson <peter...@cfdlab.ae.utexas.edu> wrote:
> So the process for resolving conflicts during pull --rebase is exactly > the same as it is during a normal rebase. I'll discuss the steps > below if you want to play along at home: thanks John. WRT this: > Yep, that seems to work just fine. All the maintainers should have > gotten an email notifying them of the pull request? Did anyone? I did not, and it looks like I am set up to get GitHub email notifications. Hmm… So… your preferred workflow is to do all development on a branch that is then periodically synced to master? Does that branch ever live at the GitHub level or is it just in your own filesystem working copy? The reason I'm asking is because I will definitely want access across different filesystems to 'in progress' features. And if they don't live at the libMesh/libmesh.git level, I'm thinking the preferred path is for developers to fork the central repo if they need network access to in-progress branches - along the lines of this: http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows#Integration-Manager-Workflow -Ben ------------------------------------------------------------------------------ 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
