Closed nbl1268 closed 7 years ago
Thanks. I'm going to close this PR, and get my fork to rebase properly. Then do a separate commit for .gitignore. Will have a look at #59 and see what i can work out with that and adding the programme name to the sidebar.
Just a heads up - there is no need to open a new PR, just reopen this PR, force push after your rebase and it will update automatically.
Ok thanks. Only had a quick look at #59 but thinking that the changes that might be needed will be much more than i had initially put in this PR so a new PR for that might be a better thing to do.
Havent been able to sort out rebasing my fork against your master such as to remove those unnecessary commits.
When i use the git rebase ribbons/master
in my git shell i end up with errors and patch file that i dont know what to do with, and as such have created a whole bunch more commits in my master that i also dont know how to remove.
Considered deleting my Master repository but that seemed a bit too rash.
I'd suggest doing something like:
git branch old-master
git reset --hard ribbons/master
That will save your old commits as old-master
in case you need to reuse anything and then reset your master branch to the same state as my master branch.
thanks, those commands followed by this one did the trick
git push -f origin master
Show Program name in side panel