-- JohnKamalRizkMeshreki - 2017-07-05


git tricks


Twiki page with info useful for git tricks and usage.


General commands


lsetup git

To get an updated version of the changes from the upstream repository to my local repository

git fetch upstream #to update your local resporatory with the upstream one

git checkout master #If you want to copy from a branch which has a different name than your bransh (Sara)

git merge upstream/master

To add changes from my local repository to my remote repository (origin)

git add * #to add which file has been edited and is going to be committed
git commit -m "comment"
git push

To add changes from my remote repository (aka origin) to the common ttbargaam remote repository (aka upstream):

#go to the link https://gitlab.cern.ch/<YOURGITUSERNAME>/ttgamma_notes.git/
#and click on new merge request
#and send the request
#and don't forget to click on "merge when pipeline is done" or "merge" (either which is there)

In case of ERRORS such as I merged some changes which did not complie but were merged anyway:

1- Press the "Revert" button on the merge request and make sure to UNMARK the box "create a new merge request" (to avoid creating another merging request which you will have to merge later with the upstream/branch)

2- update the upstream to your local by:

git fetch upstream

3- clean the installation you have with non-compiling stuff by:

make clean

4- Install the current version


The command to point to the link for the ATLAS live Latex is:

export PATH=/afs/cern.ch/sw/XML/texlive/latest/bin/x86_64-linux:$PATH

Edit | Attach | Watch | Print version | History: r1 | Backlinks | Raw View | WYSIWYG | More topic actions
Topic revision: r1 - 2017-07-05 - JohnKamalRizkMeshreki
    • Cern Search Icon Cern Search
    • TWiki Search Icon TWiki Search
    • Google Search Icon Google Search

    Sandbox All webs login

This site is powered by the TWiki collaboration platform Powered by PerlCopyright & 2008-2020 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
or Ideas, requests, problems regarding TWiki? use Discourse or Send feedback