Welcome to the Treehouse Community
Want to collaborate on code errors? Have bugs you need feedback on? Looking for an extra set of eyes on your latest project? Get support with fellow developers, designers, and programmers of all backgrounds and skill levels here with the Treehouse Community!
Looking to learn something new?
Treehouse offers a seven day free trial for new students. Get access to thousands of hours of content and join thousands of Treehouse students and alumni in the community today.Start your free trial
Mayur PandeCourses Plus Student 11,711 Points
Development branch behind master branch
I am following nvie's git branching model. However I ran into problems, as I had uploaded sensitive data to git hub. So using this link using git-filter-branch I removed the file and its history. Then I created a new file suggest.php and a separate config.php. However when I commited and merged these and then pushed them into git hub. It says my git hub development branch is 28 commits behind my git hub master branch.
So I then pulled both branches, to merge them locally on my machine however it seems to say everything is up-to-date, which is not the case. The master branch doesn't have the suggest.php file, or the .gitignore file in it.
Sue Dough35,800 Points
First off Security:
You have been 100% comprimised. Deleting the information is not enough. Change whatever passwords etc you need to change fast. If you use the same password for everything change every password you have.
It sounds like the issue is this. Your like hey git, let me do a git pull, and git is like okay. Git then gives you the git pull but its local. Its sounds like its pulling from your local host NOT GITHUB. You need to pull from the remote branch.
git pull origin master
Let me know if that helps and if you get an error let me know what it is.
Also pro tip. Use a config-sample.php or config-sample.ini for git. Then put the config.php in the .gitignore so it can't be committed and will always work when you push/pull.