We met a problem in git.(We use Atlassian Stash in our team)
A file named "one.py" was firstly changed at 2015/04/01.
Then some other developers pushed a lot of changes to server in the coming days.
Later in 2015/04/08, the "one.py" file was changed again and push to stash server.
Then some other developers pushed a lot of changes to server as usual.
And comes the problem, today (2015/04/09), I found that the "one.py" file was reverted to the revision which we pushed the changes in 2015/04/01. And when I checked the "one.py" file's change history, I can't get the change history in 2015/04/08. It lost.
What happened? Why we lost the commit history? Can you help me?
Probably your other developers used 'force' push and rewrite the GIT history in Stash.
You can enable 'disable force push' hook in your Stash repository (http://blogs.atlassian.com/2013/03/stash-22-customize-workflow-git-hooks-api-merge-checks/);
More about -force push can be found at Git documentation at http://git-scm.com/docs/git-push.
Simply put, your developers should always keep their local repo up to date by 'git pull' first, merge the conflict if any, then do 'push' to Stash.
Atlassian Summit is an excellent opportunity for in-person support, training, and networking.Learn more
Hello Community! My name is Claire Maynard, and I’m a Product Marketing Manager on the Bitbucket team. I’m interested in hearing what advice or tips you have for new users getting started on ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs