Forking Versions

[Monte Goulding]

While it is possible to commit your changes on master then merge their stuff in its a real headache to do things that way. What you want to do is create a branch to work on. Commit your changes there then when you want their stuff you checkout the branch you want to update. In the case of the LiveCode repo it is most likely develop. Then pull changes. Then checkout your branch and merge in develop. Now your branch is being kept updated with their stuff but isn't in the way when you want to get their stuff. Any merge conflicts are sorted out on your private branch.

Cheers

Monte

Sent from my iPhone

> On 9 Oct 2015, at 5:55 am, Mike Kerner <MikeKerner at roadrunner.com> wrote:
> 
> 1) In Git, if I have a fork, but then there are updates to the master
> branch, and I want to take those and replace at least some of the contents
> in my fork, do I have to create a new fork and download the entire project,
> again?  That seems like it would screw up the things I've been working on
> in my fork, and mean that I would have to manually re-integrated the things
> I'm doing in the files I'm working on.
> 
> 2) I've been messing around with various widgets, but I'm not messing with
> the engine, but there does not seem to be a way to fork part of the project
> without forking all of it.
> 
> -- 
> On the first day, God created the heavens and the Earth
> On the second day, God created the oceans.
> On the third day, God put the animals on hold for a few hours,
>   and did a little diving.
> And God said, "This is good."
> _______________________________________________
> use-livecode mailing list
> use-livecode at lists.runrev.com
> Please visit this url to subscribe, unsubscribe and manage your subscription preferences:
> http://lists.runrev.com/mailman/listinfo/use-livecode