The most important of all! If you make a PR your commits have to be on top of the latest commit of FreeCAD master branch. Means the commit id of FreeCAD master and the id of the latest commit before your commits need to be the same. Do you understand this?
1.
Thus to get the latest master of FreeCAD you somehow need to rebase your repository. This is my first point.
Afterwards you need to get your commit on top of this uptodate master branch. There are severall ways to archive this. My points 2 and 3 are just showing one way to archive this.
bernd
Since you only have rare commit you do not need to rebase your features. You could cherry-pick them as well. It is much easier to handle than a rebase.
If we get it done, you even could reopen your PR
If you would like to give it another try, post the output of the following commands ...
Code: Select all
git remote -v
Code: Select all
git log -10 --oneline ArchEquipment_1_SketchArch_UpdateAttachmentObject_support