Here's the place for discussion related to coding in FreeCAD, C++ or Python. Design, interfaces and structures.
bernd
Veteran
Posts: 12851 Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:
Post
by bernd » Fri Oct 01, 2021 3:39 pm
deleted the branch and did checkout it new and cherry-picked the 4 commits
Code: Select all
$
$ git status
On branch FreeCAD-0-19
Your branch is ahead of 'origin/releases/FreeCAD-0-19' by 4 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
$
$
$ git push
Username for 'https://github.com': berndhahnebach
Password for 'https://berndhahnebach@github.com':
Everything up-to-date
$
$
$ git push origin releases/FreeCAD-0-19
error: src refspec releases/FreeCAD-0-19 does not match any.
error: failed to push some refs to 'https://github.com/FreeCAD/FreeCAD'
$
openBrain
Veteran
Posts: 9041 Joined: Fri Nov 09, 2018 5:38 pm
Contact:
Post
by openBrain » Fri Oct 01, 2021 3:40 pm
Eventually also 'git branch -vv' could give some clues
openBrain
Veteran
Posts: 9041 Joined: Fri Nov 09, 2018 5:38 pm
Contact:
Post
by openBrain » Fri Oct 01, 2021 3:42 pm
bernd wrote: ↑ Fri Oct 01, 2021 3:39 pm
deleted the branch and did checkout it new and cherry-picked the 4 commits
Seems the sync is correct now. Just 'git push' should be OK.
EDIT : didn't carefully read your bash snippet. This is really weird.
bernd
Veteran
Posts: 12851 Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:
Post
by bernd » Fri Oct 01, 2021 3:49 pm
Code: Select all
$
$ git branch -vv
* FreeCAD-0-19 974717c588 [origin/releases/FreeCAD-0-19: ahead 4] [UnitTest] Fix UnitTests - use utf-8
master b4f77d3c62 [origin/master] Part: [skip ci] make TopoShape::setFaces 30% faster
$
bernd
Veteran
Posts: 12851 Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:
Post
by bernd » Fri Oct 01, 2021 3:53 pm
I gave up ...
push to my repo, make a PR on github, merge the PR ...
bernd
Veteran
Posts: 12851 Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:
Post
by bernd » Fri Oct 01, 2021 3:56 pm
openBrain
Veteran
Posts: 9041 Joined: Fri Nov 09, 2018 5:38 pm
Contact:
Post
by openBrain » Fri Oct 01, 2021 3:58 pm
bernd wrote: ↑ Fri Oct 01, 2021 3:49 pm
Code: Select all
$
$ git branch -vv
* FreeCAD-0-19 974717c588 [origin/releases/FreeCAD-0-19: ahead 4] [UnitTest] Fix UnitTests - use utf-8
master b4f77d3c62 [origin/master] Part: [skip ci] make TopoShape::setFaces 30% faster
$
Maybe you need a complete refspec :
Code: Select all
git push origin FreeCAD-0-19:releases/FreeCAD-0-19
bernd
Veteran
Posts: 12851 Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:
Post
by bernd » Fri Oct 01, 2021 3:59 pm
I will keep it if need to push to this branch again ...
bernd
Veteran
Posts: 12851 Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:
Post
by bernd » Fri Oct 01, 2021 4:08 pm