Hello Guest, if you are reading this it means you have not registered yet. Please take a second, Click here to register, and in a few simple steps you will be able to enjoy our community and use our OpenViX support section.
Results 1 to 5 of 5

Thread: GitHub Creating pull requests

  1. #1
    abu baniaz's Avatar
    Title
    Moderator
    Join Date
    Sep 2010
    Location
    East London
    Posts
    23,338
    Thanks
    6,422
    Thanked 9,146 Times in 6,224 Posts

    GitHub Creating pull requests

    A guide I did for someone else on another project. Please feel free to submit corrections or enhancements.

    This is the guide for the Web aspect of it. Most people who contribute use a Git client like Sourcetree.
    Attached Files Attached Files

  2. The Following 5 Users Say Thank You to abu baniaz For This Useful Post:

    dsayers (21-10-19),el bandido (08-03-19),rimas (17-12-18),Sicilian (04-11-19)

  3. #2
    abu baniaz's Avatar
    Title
    Moderator
    Join Date
    Sep 2010
    Location
    East London
    Posts
    23,338
    Thanks
    6,422
    Thanked 9,146 Times in 6,224 Posts
    To help keep your fork (copy of project) synchronised.....

    Point 1A
    If you have already made changes to dev and master branches in your fork and do not need the changes, delete the project from your GitHub account and start agian.


    Point 1B
    If you have already made changes to dev and master branches in your fork want to keep the changes,

    On Sourcetree, rename the branches on your PC that you have already modified. Perhaps "dev/master_with_my_changes_ todays_date"

    If you want to keep the changes because you have other changes, push the renamed master and dev branches to your GitHub account
    Using Sourcetree, push/send the newly renamed branches to GitHub

    On GitHub website delete the existing master/dev branches. (We are doing this because they have changes)

    On sourcetree, click on upstream, origin, double click master/dev branches. You are now forking the the official (i.e without your changes) Vix master/dev branches back to your fork.
    Push these branches to your GitHub account.

    Create a new branch, merge the branches you had renamed earlier "dev/master_with_my_changes_ todays_date" into this new branch


    Point 2
    If you build your own images with changes that you make, do not build from the dev branch. Make a new branch from "dev", example "my_dev" and build from this new branch.

    Sourcetree guide to follow
    Last edited by abu baniaz; 23-11-20 at 21:24. Reason: Reworded guide if have changes already

  4. The Following User Says Thank You to abu baniaz For This Useful Post:


  5. #3
    abu baniaz's Avatar
    Title
    Moderator
    Join Date
    Sep 2010
    Location
    East London
    Posts
    23,338
    Thanks
    6,422
    Thanked 9,146 Times in 6,224 Posts
    Sourcetree guide attached

    Commandline guide
    Code:
    https://help.github.com/en/articles/syncing-a-fork
    If you want the web based method, try this
    Code:
    https://github.com/KirstieJane/STEMMRoleModels/wiki/Syncing-your-fork-to-the-original-repository-via-the-browser
    I could never do it from the browser. Hopefully someone who knows can post in another thread and I will add to this guide
    Attached Files Attached Files

  6. The Following 2 Users Say Thank You to abu baniaz For This Useful Post:

    Sicilian (04-11-19)

  7. #4
    abu baniaz's Avatar
    Title
    Moderator
    Join Date
    Sep 2010
    Location
    East London
    Posts
    23,338
    Thanks
    6,422
    Thanked 9,146 Times in 6,224 Posts
    I added this to my repositories

    Code:
    https://github.com/wei/pull#readme
    Keeps master branch in forks in sync with upstream repositories

  8. The Following 2 Users Say Thank You to abu baniaz For This Useful Post:

    Sicilian (04-11-19)

  9. #5
    abu baniaz's Avatar
    Title
    Moderator
    Join Date
    Sep 2010
    Location
    East London
    Posts
    23,338
    Thanks
    6,422
    Thanked 9,146 Times in 6,224 Posts
    In order to list changes in a csv file, adapted from
    Code:
    https://stackoverflow.com/questions/10418056/how-do-i-generate-a-git-commit-log-for-the-last-month-and-export-it-as-csv
    git log --before="2019-09-30" --pretty=format:'"%h","%an","%ae","%aD","%s",' --shortstat --no-merges | paste - - - > before_21090930_log.csv


    git log --after="2017-12-31" --pretty=format:'"%h","%an","%ae","%aD","%s",' --shortstat --no-merges | paste - - - > after_21071231_log.csv

  10. The Following User Says Thank You to abu baniaz For This Useful Post:


Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •  
This website uses cookies
We use cookies to store session information to facilitate remembering your login information, to allow you to save website preferences, to personalise content and ads, to provide social media features and to analyse our traffic. We also share information about your use of our site with our social media, advertising and analytics partners.