On Wed, Sep 7, 2016 at 10:19 AM, <kevin.d...@nsstc.uah.edu> wrote:

> Colleague:
>
> Before I decide to learn GIT I would like to know if it can partially
> handle a task which I will describe briefly.  I work with a large numerical
> weather prediction modeling system called WRF.  For sake of simplicity
> let’s suppose I start with version A which has been unmodified by me.  I
> make changes to A which makes version B.  Then comes along a new version C
> from the WRF distributer.  Would GIT help me take the changes I made in
> version B and incorporate them into version C to make a new version D?
> What would that operation be called in the GIT context?
>
> Many thanks,
> Kevin Doty
>

That's merging.

The way you'd do this is start with A, create a branch on which you do your
fiddling and end uopp with B.

Likewise do the same for a branch with the changes ending up with C. Then
merge the two branches and see if that works.

So it sounds like you're hoping git will magically do merges for you...
That might be wishing too much.

Git is pretty good at merging changes in source code, but cannot
effectively merge binary code. Even machine XML is more like binary code
than text and often gets messed up.

>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to