Home User profile
tagDiv Member
This user did not write anything. So we are just showing here some random text to make the profile page look nice :)
rantta
tagDiv Member

Using Git, I’m still trying to learn it so I’m not any good on advising how to use it properly. And I tried several times to do it, so I’m not QUITE sure how I actually did it…

But here is what I think I did:

1. I created an master branch with original code
2. I created side branch with my modified code
3. I added updated files (updates from tagdiv@envato) on the master branch
4. I committed the changes
5. From master I rebased (not merged) the code with my modified code

I was few steps ahead with my own codebranch, so before doing the actual rebase I also rebased it few steps, like
$ git rebase -i head~5

Earlier I tried to merge the code, but that did not work so great. Rebasing did the job.

rantta
tagDiv Member

Ha, no worries! I did get some good advices and now I’m on version 7.4.

rantta
tagDiv Member

Hi,

is there any download library to download patches individually?

I have made some changes to the code on version 7.1. Now I’m stuck on it, because I only have patches to upgrade from 7.2 -> 7.3 and from 7.3 to 7.4.

So I’m missing patches from 7.1 -> 7.11 and 7.11 -> 7.2., and on Envato there is only the newest package.

I tried to rebase the full code in git, but I’m probably not mastering that so well yet 😛

Viewing 3 posts - 1 through 3 (of 3 total)