tags: github

Alex show me how to rebase:

kaau@OCLT71159526 ~$ cd ${HOME}/myproj
kaau@OCLT71159526 ~/myproj$ git clone https://github.com/BMO-Prod/NACBSRE_sre_cac_86039.git
Cloning into 'NACBSRE_sre_cac_86039'...
remote: Enumerating objects: 15795, done.
remote: Counting objects: 100% (966/966), done.
remote: Compressing objects: 100% (456/456), done.
remote: Total 15795 (delta 685), reused 550 (delta 474), pack-reused 14829 (from 3)
Receiving objects: 100% (15795/15795), 5.15 MiB | 1.56 MiB/s, done.
Resolving deltas: 100% (8987/8987), done.
Updating files: 100% (562/562), done.

kaau@OCLT71159526 ~/myproj$ cd NACBSRE_sre_cac_86039
kaau@OCLT71159526 ~/myproj/NACBSRE_sre_cac_86039$ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean

kaau@OCLT71159526 ~/myproj/NACBSRE_sre_cac_86039$ git switch NACBSRE-5749-tbd-fix-linting
branch 'NACBSRE-5749-tbd-fix-linting' set up to track 'origin/NACBSRE-5749-tbd-fix-linting'.
Switched to a new branch 'NACBSRE-5749-tbd-fix-linting'

kaau@OCLT71159526 ~/myproj/NACBSRE_sre_cac_86039$ git branch
* [[green:NACBSRE-5749-tbd-fix-linting]]
  master

#
# to rebase:
#
kaau@OCLT71159526 ~/myproj/NACBSRE_sre_cac_86039$ git fetch origin
kaau@OCLT71159526 ~/myproj/NACBSRE_sre_cac_86039$ git rebase origin/master
Successfully rebased and updated refs/heads/NACBSRE-5749-tbd-fix-linting.

kaau@OCLT71159526 ~/myproj/NACBSRE_sre_cac_86039$ git status
On branch NACBSRE-5749-tbd-fix-linting
Your branch and 'origin/NACBSRE-5749-tbd-fix-linting' have diverged,
and have 2 and 1 different commits each, respectively.
  (use "git pull" if you want to integrate the remote branch with yours)
nothing to commit, working tree clean

kaau@OCLT71159526 ~/myproj/NACBSRE_sre_cac_86039$ git push --force-with-lease origin NACBSRE-5749-tbd-fix-linting
Enumerating objects: 79, done.
Counting objects: 100% (79/79), done.
Delta compression using up to 14 threads
Compressing objects: 100% (29/29), done.
Writing objects: 100% (42/42), 7.21 KiB | 615.00 KiB/s, done.
Total 42 (delta 27), reused 21 (delta 8), pack-reused 0 (from 0)
remote: Resolving deltas: 100% (27/27), completed with 26 local objects.
remote: 
remote: GitHub found 1 vulnerability on BMO-Prod/NACBSRE_sre_cac_86039's default branch (1 moderate). To find out more, visit:
remote:      https://github.com/BMO-Prod/NACBSRE_sre_cac_86039/security/dependabot/60
remote: 
To https://github.com/BMO-Prod/NACBSRE_sre_cac_86039.git
 + 4298723...8e9514f NACBSRE-5749-tbd-fix-linting -> NACBSRE-5749-tbd-fix-linting (forced update)