Re: Forking Versions

git will throw an error if you try to push and your commits aren't ancestors of the head of the branch you are pushing. You can get around this by force pushing but don't do that... Nasty... I don't even know why git allows it. Sent from my iPhone > On 10 Oct 2015, at 4:57 pm, Mark Wieder wrot

Re: Forking Versions

On 10/09/2015 07:49 PM, Mike Kerner wrote: It's the details that make any system more difficult. For instance, when you want to merge a change into the main, you do a pull, even though from your perspective you're pushing. No, it's just better to pull before pushing. That way if anyone has pu

Re: Forking Versions

> So checkout is the same as syncing? Hmm… checkout is just getting setting the state of all the files in the repo to the state they were in when you committed. It’s a local operation. > It's the details that make any system more difficult. For instance, when > you want to merge a change into

Re: Forking Versions

So checkout is the same as syncing? It's the details that make any system more difficult. For instance, when you want to merge a change into the main, you do a pull, even though from your perspective you're pushing. In the case of LC, you have to pull the entire project, even if all you're really

Re: Forking Versions

> On 10 Oct 2015, at 2:51 am, Richard Gaskin wrote: > > Github is simple - if what you're building is the Linux kernel, which is what > it was designed for. ;) Actually the hardcore guys don’t use GitHub… they have a mailing list and pass around patch files which git can also generate. GitHub

Re: Forking Versions

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...@f

Re: Forking Versions

wow, what a pain. On Thu, Oct 8, 2015 at 5:55 PM, Monte Goulding 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 r

Re: Forking Versions

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 This adds the official repo as a remote named upstream which is the normal name of the original repo when you have a f

Re: Forking Versions

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 Li

Forking Versions

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 m