GithubHelp home page GithubHelp logo

Comments (7)

joariasl avatar joariasl commented on June 21, 2024
  1. First add remote repository if this is not added and working with the master branch:
    $ git checkout master
    $ git remote add panos https://github.com/PanosSakkos/personal-jekyll-theme.git
    (panos name is added by the origin is other primary repository)
  2. Pull request with rebase for not create a new commit:
    $ git pull --rebase panos master
    or (is equals)
    $ git fetch panos
    $ git rebase panos master
  3. Publish changes in our fork:
    $ git push origin master
    (In case of that origin is our fork repository)

If I have time I publish myself. I am busy with my degree work. Although my English is not very good.

from personal-jekyll-theme.

joariasl avatar joariasl commented on June 21, 2024

Best use "upstream" name for original repository instead of panos. :P

from personal-jekyll-theme.

le4ker avatar le4ker commented on June 21, 2024

But the idea is to document it (or provide a script) for users who have already forked a past checkpoint and they have added their own content.

For example, imagine the following scenario:

Imagine Alice, who forked { Personal } one month ago.
She replaced the content with hers, and she already has published posts, has her own _config.yml etc.

The goal is to make it very easy for Alice to integrate all the features and the bug fixes that we have in the repo (i.e.) today, into her website, without losing her content ;)

I'm busy to tackle this and I want first to fix issue #25.
So feel free to work in this issue in your free time! :)

from personal-jekyll-theme.

le4ker avatar le4ker commented on June 21, 2024

Added this guy 2d18f0a and used it to integrate the latest changes into my website and it worked.

The only caveat is that if there are you miss the site config changes, because this file contains user's data, plus (probably) new configuration features.
So when you actually use this script, you need to run a diff between the two site configs, and then migrate manually the newly added configuration options.

I will document it in the wiki as carefully as I can :)

from personal-jekyll-theme.

le4ker avatar le4ker commented on June 21, 2024

Added the documentation here.

Feel free to give me feedback on the steps from a user's perspective ;)

from personal-jekyll-theme.

joariasl avatar joariasl commented on June 21, 2024

I make the gh-pages branch and modify this with my personal configuration. When I modify the main features I change to master branch and merge to gh-pages.
So I keep a clean code and I send a pull request.

from personal-jekyll-theme.

le4ker avatar le4ker commented on June 21, 2024

Sure, but you are doing this in order to contribute to the { Personal } repository.

My purpose was to help users who have downloaded { Personal } and put it in a different X.github.io repository (i.e.), and they want to pull the latest changes from the official { Personal } repository ;)

from personal-jekyll-theme.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.