Github is simple - if what you're building is the Linux kernel, which is
what it was designed for. ;)
--
Richard Gaskin
Fourth World Systems
Software Design and Development for the Desktop, Mobile, and the Web
____________________________________________________________________
ambassa...@fourthworld.com http://www.FourthWorld.com
Mike Kerner wrote:
wow, what a pain.
On Thu, Oct 8, 2015 at 5:55 PM, Monte Goulding <monte at sweattechnologies.com>
wrote:
Oh, you also need to add the official repo as a remote on your fork:
git remote add upstream https://github.com/livecode/livecode.git <
https://github.com/livecode/livecode.git>
This adds the official repo as a remote named upstream which is the normal
name of the original repo when you have a fork. Your fork is called origin.
What you want to do is pull the changes from upstream (the company repo),
make commits and push them to origin (your fork). If you have anything to
contribute you can then send a pull request which is basically a request
for them to merge in the changes on a branch on your fork into the official
repo.
Now that you have added upstream as a remote you want to set the upstream
of each of the official branches that you have checked out. Say you have
checked out develop (livecode 8) then you want to do this:
git branch --set-upstream develop upstream/develop
This means that when you checkout develop and pull it will automatically
pull from the upstream remote (the company repo) rather than your origin
remote (your fork).
Anyway I hope that helps ;-)
> 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@lists.runrev.com
Please visit this url to subscribe, unsubscribe and manage your subscription
preferences:
http://lists.runrev.com/mailman/listinfo/use-livecode
