Dang your right! I just resolved the contributors.md conflict on my end. @biscuitmanz You get off easy this time 
@DavidMatthewFraser, @camperextraordinaire no doubt it have to do one at some point il have to look them up and see what there all about
Hello, what is the ideal way to have my fork updated? I made a reverse pull request, that is, I compared the original with that of my github account and so I could update it. Another question, how can I delete a branch?
Edit: The branch can already be deleted with the console
It took FOR EVER but i got the your changes up … And They Look Amazing! Good work sir!
1 Like
@DavidMatthewFraser thanks for sorting that out mate, glad you like it too 
il do smaller branches in future and try not to mess with other stuff on the page, still very new to this merge stuff lol
So will i have to re pull from your repo now to make an up to date branch yeah? it says im 51 commits behind
Yea I think it is,
git checkout myBranch
git merge origin/master
Tell me if that works
$ git checkout myBranch
error: pathspec 'myBranch' did not match any file(s) known to git
replace myBranch with the name of your branch
im already in my add-biscuit branch do i still have to do git checkout?
Ummmmmmmmmmmmm. Prolly not, try it
say already upto date
$ git merge origin/master
Already up to date.
what if u do git checkout name-of-your-branch first
yeah says im already on it
$ git checkout add-biscuit
Already on 'add-biscuit'
should i be changing to master?
Yes, unless there is some features on your fork that are not on master that you want to keep
my branch on my github says its upto date with yours but my master is 51 commits behind it says, so iv just pulled the biscuit branch
this ones got a puzzle folder so that be up to date then i think aint it?
if opening index.html looks like this: https://davidmatthewfraser.github.io/easy-to-git/
git remote add upstream https://github.com/some_user/some_repo
git fetch upstream
git checkout master
git reset --hard upstream/master
git push origin master --force
1 Like