Coder Social home page Coder Social logo

Comments (19)

rtorr avatar rtorr commented on July 19, 2024

@suchtie want to make s pull request? Great idea :)

from vim-cheat-sheet.

astralfields avatar astralfields commented on July 19, 2024

I would if I knew how to properly use git. :/ I manage repos just for myself so I only write directly to master. That's why I made a suggestion thread in the first place.

Well, I have some time on my hands anyway, why not spend it learning something useful? Time to read that nice git wikibook again, I guess. (And I also need to figure out the page structure, I never used Jekyll.)

from vim-cheat-sheet.

tkraak avatar tkraak commented on July 19, 2024

@suchtie ... please get in touch ... I'd be glad to talk you thru Git & Jekyll.

from vim-cheat-sheet.

tkraak avatar tkraak commented on July 19, 2024

I'll also spell out the steps here later tonight for everybody else.

from vim-cheat-sheet.

rtorr avatar rtorr commented on July 19, 2024

@suchtie this repo is friendly to first time pulls requests. I'll help you through it. Let me know if you have issues with the readme or GitHub! :)

from vim-cheat-sheet.

tkraak avatar tkraak commented on July 19, 2024

@suchtie I've initiated the pull requests for you.

Here is a high-level overview of the steps involved:

  • fork this repository (make a personal copy into your GitHub account)
  • clone your fork (download the forked repo to your machine)
  • create a new branch off master and switch to it
  • open index.html and _config.yml and add to it appropriately
  • commit your changes
  • push your changes
  • open a pull request from your fork

As @rtorr mentioned, this is a beginner-friendly repository ... never hesitate to ask for help!

from vim-cheat-sheet.

rtorr avatar rtorr commented on July 19, 2024

@tkraak awesome!

from vim-cheat-sheet.

rtorr avatar rtorr commented on July 19, 2024

@tkraak should I wait on those pull requests?

from vim-cheat-sheet.

rtorr avatar rtorr commented on July 19, 2024

@tkraak also my only suggestion is to do a pull request on master and not gh-pages

from vim-cheat-sheet.

rtorr avatar rtorr commented on July 19, 2024

@tkraak so it looks like you made changes on the gh-pages branch on your local. Both should be master, that way there isnt a huge merge.

from vim-cheat-sheet.

tkraak avatar tkraak commented on July 19, 2024

@rtorr ... thanks! So you are saying I should never touch gh-pages at all?

I've fixed the pull requests. Will that work?

from vim-cheat-sheet.

rtorr avatar rtorr commented on July 19, 2024

@tkraak as of right now, I issue pull requests from master to gh-pages. When you clone the repository, you should only worry about master or creating a branch off of master. This sometimes allows me to merge changes and fix/add things before it goes live on the site. It looks right now that you are merging a local copy of the gh-pages branch into this repos master.

from vim-cheat-sheet.

tkraak avatar tkraak commented on July 19, 2024

@rtorr I got you now, makes total sense and I like your workflow / thinking. Learned something!

Give me a few hours to issue proper pull requests from master.

from vim-cheat-sheet.

rtorr avatar rtorr commented on July 19, 2024

@tkraak you rock! thanks :)

from vim-cheat-sheet.

tkraak avatar tkraak commented on July 19, 2024

@rtorr Something still does not seem right with the new PR I just submitted. Why does it include 21 commits? Looks like I have to start over from the VERY beginning?!

from vim-cheat-sheet.

rtorr avatar rtorr commented on July 19, 2024

@tkraak it looks like at some point your branch pulled or was copied from gh-pages branch https://github.com/tkraak/vim-cheat-sheet/network :(

I know this is frustrating. I could merge it and be done with it for you :)

from vim-cheat-sheet.

rtorr avatar rtorr commented on July 19, 2024

@tkraak @suchtie merged 💃

#115

from vim-cheat-sheet.

tkraak avatar tkraak commented on July 19, 2024

@rtorr I'm 100% sure it's due to me messing with gh-pages early on :)

All good now since it was a clean merge on your end either way.

I'll start over with a new fork and new local repo for further contributions ... thanks!

from vim-cheat-sheet.

rtorr avatar rtorr commented on July 19, 2024

@tkraak no worries! I knew it would work, just adds a lot of merge commits. I am happy for your help.

Thanks again.

from vim-cheat-sheet.

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.