On Tue, Dec 11, 2012 at 7:24 PM, Kirk, Benjamin (JSC-EG311)
wrote:
> On Dec 11, 2012, at 6:14 PM, John Peterson
> 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 a
On Tue, 11 Dec 2012, Kirk, Benjamin (JSC-EG311) wrote:
> http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows#Integration-Manager-Workflow
Who volunteers to be integration manager? If it's not the most
prolific developer then they're not going to be able to keep up (I'm
recalling th
On Dec 11, 2012, at 6:14 PM, John Peterson
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.
On Tue, Dec 11, 2012 at 4:10 PM, John Peterson
wrote:
> On Tue, Dec 11, 2012 at 2:21 PM, John Peterson
> wrote:
>> On Mon, Dec 10, 2012 at 5:04 PM, Kirk, Benjamin (JSC-EG311)
>> wrote:
>>> libMesh users & developers:
>>>
>> Then the work flow is as follows:
>>
>> 1.)
>> 2.) git co master
>> 3.)
By the way, you may also want to put the following in your ~/.gitconfig file.
It sets us some nice color coding for looking at logs and sets up a
few two letter abbreviations that are handy.
[user]
name = Your Name
email = [email protected]
[color]
diff = auto
status = au
On Tue, Dec 11, 2012 at 2:21 PM, John Peterson
wrote:
> On Mon, Dec 10, 2012 at 5:04 PM, Kirk, Benjamin (JSC-EG311)
> wrote:
>> libMesh users & developers:
>>
> Then the work flow is as follows:
>
> 1.)
> 2.) git co master
> 3.) git fetch
> 4.) git merge origin/master
> 5.) git co branch_name
>
On Dec 11, 2012, at 3:24 PM, Roy Stogner wrote:
>
> On Tue, 11 Dec 2012, Ataollah Mesgarnejad wrote:
>
>> I tried what you suggested, however when I check the NumericVector
>> type of my added vector (I add it as GHOSTED before read) after
>> EquationSystems::Read() it changes to parallel ?!!
On Tue, 11 Dec 2012, Ataollah Mesgarnejad wrote:
> I tried what you suggested, however when I check the NumericVector
> type of my added vector (I add it as GHOSTED before read) after
> EquationSystems::Read() it changes to parallel ?!! ( I checked with
> NumericVector::type() it was 3 before th
On Mon, Dec 10, 2012 at 5:04 PM, Kirk, Benjamin (JSC-EG311)
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.c
Roy,
I tried what you suggested, however when I check the NumericVector type of my
added vector (I add it as GHOSTED before read) after EquationSystems::Read() it
changes to parallel ?!! ( I checked with NumericVector::type() it was 3 before
the read and 2 after)
Is there a work around so I
10 matches
Mail list logo
