Hi,
Rocky Bernstein wrote:
> > In other words, this is supposed to be a stress on you, we want you to
> > succeed.
Mario Đanić wrote:
> Hopefully you meant NO stress on him, we dont want him stressed out :D
Good to see that the younger generation cares for the blood pressure of us
babyboomers. :))
I wrote:
> > What happens if somebody else pushed a modified master after i pulled
> > but before i push ?
Mario Đanić wrote:
> Rebase or merge. There are always ways :)
I will remind you of your optimism if i ever mess up our own git repo.
-------------------------------------------------------------------------
Ok, i read man pages about the proposed commands and then ran them:
git checkout master
git pull
# I asked for commit id: git log pete_batard_ce_v3 | less
git merge fdd76a8ee4f4f00f1eabc6f632322db800ee9970
# I verified that really both commits of the branch are shown by git log
# and repeated my tests as of my mail of 23 Mar 2023 20:12:24 +0100
make
make install
iso-info --no-joliet -i firmware-bookworm-DI-alpha1-amd64-netinst.iso -l
iso-info --no-joliet -i iso9660_early_ce.iso
# git log pete_batard_gcc_warnings | less
git merge 569c452f8d1650c0ec50ebeef7869b54ed9c8be6
# I was faced with an editor session of GNU nano and wrote
# Explicit initialization of tm_temp_tmp
# Then i exited with saving to the proposed file name.
# git log shows commit 569c452 and a commit with the editor texA.t
(I wonder what would happen if i ran a third merge.)
# No idea how to test the change of pete_batard_gcc_warnings except:
make ; make install
# and again the iso-info runs.
git status
# says: Your branch is ahead of 'origin/master' by 4 commits.
# and shows me all my unadded experimentally altered souce files
Everything looks as expected.
So:
git push
says
Counting objects: 4, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 423 bytes | 0 bytes/s, done.
Total 4 (delta 3), reused 0 (delta 0)
To scdbac...@git.sv.gnu.org:/srv/git/libcdio.git
6f2426e..3a737bc master -> master
Now check whether you want me to do such a thing ever again. :o)
Have a nice day :)
Thomas
