Git is more than just SVN++ apparently...
Because we're not using git properly, some committed changes have be
undone by others by uncarefull merging to the reference repo.
All commits with changes are in the commit log (even those "lost commits"):
I am trying to find out what's going on and how we should handle it. Not
I 'll also look into restoring the lost commits.
Meanwhile I'd like to ask you to follow the following instructions:
- *only use the command line to pull or push changes* (for the next
month, untill we get used to git).
- before you do "git push" do "*git log --branches --not --remotes*"
This shows you what you'll be pushing
- When doing an "svn update" from master, do "*git pull --rebase*"
instead of "git pull" (Emmanual recommends that in his blog post).
-- But when doing usin rebasing on a remote topic branch, be careful not
to break the rule "Do not rebase commits that you have pushed to a
- Do *not* use "git reset" or "git push --force", contact me and keep
your commits local meanwhile.
HTH a bit already.
With kind regards,
Geoffrey De Smet