bernd wrote: ↑Thu Oct 07, 2021 6:21 pm
hope that helps keep asking if you have problems ...
I have not much idea what needs to be done, reading your procedures, checking stackoverflow etc., finally do below just follow git's hint, is that ok ?
Code: Select all
[paullee@fedora FreeCAD]$ git checkout ArchEquipment_1_SketchArch_UpdateAttachmentObject_support
Switched to branch 'ArchEquipment_1_SketchArch_UpdateAttachmentObject_support'
Your branch and 'origin/ArchEquipment_1_SketchArch_UpdateAttachmentObject_support' have diverged,
and have 1026 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
[paullee@fedora FreeCAD]$ git pull
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (1/1), done.
remote: Total 3 (delta 1), reused 1 (delta 1), pack-reused 2
Unpacking objects: 100% (3/3), 11.49 KiB | 784.00 KiB/s, done.
From https://github.com/paullee0/FreeCAD
24e472cdde..50056dca9f ArchWall_BugFixes_14 -> origin/ArchWall_BugFixes_14
0e81e76f7d..d90c1ff72f Draftutils_BugFixes_01 -> origin/Draftutils_BugFixes_01
e6b7bb18b9..232fda3faa master -> origin/master
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Merge made by the 'recursive' strategy.
[paullee@fedora FreeCAD]$ git push origin
Username for 'https://github.com': paullee0@gmail.com
Password for 'https://paullee0@gmail.com@github.com':
Enumerating objects: 14, done.
Counting objects: 100% (14/14), done.
Delta compression using up to 4 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 926 bytes | 926.00 KiB/s, done.
Total 6 (delta 4), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (4/4), completed with 4 local objects.
To https://github.com/paullee0/FreeCAD.git
4d816f35bb..49ecd1b1b6 ArchEquipment_1_SketchArch_UpdateAttachmentObject_support -> ArchEquipment_1_SketchArch_UpdateAttachmentObject_support
[paullee@fedora FreeCAD]$