(Gramps 6.0.6 on Kubuntu 24.04)
Hello everybody,
I precise that I am an old school programer and that I discover git. I watched a few tutorial on git but between theory and practice there is a gap…
I created the addon “AncestryTableReport” on the branch maintenance/gramps60. I succeed to push the .grp.py and the .py files. I also have an active branch called gramps60. Now I try to push the template.pot file and the fr-local.po file. Locally I work on my gramps60 branch. When I try to push (git push origin gramps60), I have this message :
To github.com:gramps-project/addons-source.git
! [rejected] gramps60 → gramps60 (non-fast-forward)
error: impossible to push references to ‘github.com:gramps-project/addons-source.git’
tips: Updates were rejected because the tip of your current branch is behind
tips: its remote counterpart. If you want to integrate the remote changes,
tips: use ‘git pull’ before pushing again.
tips: See the ‘Note about fast-forwards’ in ‘git push --help’ for details.
When I look at my branch gramps60 on github, I can see that the branch has behind=22 and ahead=2.
How can I resolve my problem ?
Thanks a lot for your help.
Bruno