I don’t know if my remote branch is now screwed up, if so I will do my usual solution and delete the upline repository, and reclone it on both github and locally. At that point I figured it was a lost cause and wrote the whole thing off and closed and deleted the pull request in fritzing-parts on github and deleted the local branch. When I fumbled around some more (probably trying the git pull they suggested) it managed to lose what branch it was dealing with and started asking what branch I wanted to merge with. When I made the change and pushed my local branch I got the reject message in the post above. As I recall, I backed off a commit (which is probably my mistake) to make a change. I don’t have them any more, as I deleted the pull request and the branch. If you are using the terminal, could you write all the git commands that you used?
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |