Git – Keeping your code up to date! Forums 48 – Programming Git – Keeping your code up to date!


Viewing 6 posts - 1 through 6 (of 6 total)
  • Author
  • #43050
    Support @QUE.COM

    Git – Keeping your code upto date!
    After cloning, we recommend creating a branch and doing your development on that branch:

    git checkout -b develop

    (assuming develop is the name of your branch)

    If the TAs push out an update to the assignment, you should commit (or stash if you are more comfortable with git) the changes that are unsaved in your repository:

    git commit -am “

    Then update the master branch from remote:

    git fetch origin master

    This updates your local copy of the master branch. Now try to merge the master branch into your development branch:

    git merge master

    (assuming that you are on your development branch)

    While on your development branch you can also just run:

    git pull origin master

    which will perform a fetch and then a merge into the branch you are on.

    There are likely to be merge conflicts during this step. If so, first check which files are in conflict:

    git status

    The files in conflict are the ones that are “Not staged for commit”. Open these files using your favourite editor and look for lines containing <<<< and >>>>. Resolve conflicts in whatever way you deem best. You can use special software like Sublime Merge to do so. Once you have resolved all conflicts, stage the files that were in conflict:

    git add -A .

    Finally, commit the new updates to your branch and continue developing:

    git commit -am “

    Support @QUE.COM

    // delete branch locally
    git branch -d localBranchName

    // delete branch remotely
    git push origin –d remoteBranchName

    Support @QUE.COM

    When I run npm install, it returns with ERR! code EINTEGRITY

    This works for me.
    npm cache clear –force && npm install –no-shrinkwrap –update-binary


    npm config set package-lock false

    other alternative options.

    Support @QUE.COM

    # force push
    git push origin +branchname

    Support @QUE.COM

    If you have untracked file, simply issue the command.
    git add *
    git commit -am ‘your comment’
    git push [enter] – This is to upload all file/uploaded changes.

    Support @QUE.COM

    Create a new git repository.
    Go to github.
    Log in to your account.
    Click the new repository button in the top-right.
    Click the “Create repository” button.

    $ git remote add origin
    $ git push -u origin master

    git remote add origin
    git branch -M main
    git push -u origin main

    git remote set-url origin
    git remove -v // check the status of remote origin

Viewing 6 posts - 1 through 6 (of 6 total)
  • You must be logged in to reply to this topic.