<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
<body text="#000000" bgcolor="#ffffff">
Git is more than just SVN++ apparently...<br>
Because we're not using git properly, some committed changes have be
undone by others by uncarefull merging to the reference repo.<br>
All commits with changes are in the commit log (even those "lost
commits"):<br>
<a class="moz-txt-link-freetext" href="https://github.com/droolsjbpm/droolsjbpm/commits/">https://github.com/droolsjbpm/droolsjbpm/commits/</a><br>
<br>
I am trying to find out what's going on and how we should handle it.
Not sure yet.<br>
I 'll also look into restoring the lost commits.<br>
<br>
Meanwhile I'd like to ask you to follow the following instructions:<br>
- <b>only use the command line to pull or push changes</b> (for the
next month, untill we get used to git).<br>
- before you do "git push" do "<b>git log --branches --not --remotes</b>"
This shows you what you'll be pushing<br>
- When doing an "svn update" from master, do "<b>git pull --rebase</b>"
instead of "git pull" (Emmanual recommends that in his blog post).<br>
-- 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 public repository."<br>
- Do <b>not</b> use "git reset" or "git push --force", contact me
and keep your commits local meanwhile.<br>
<br>
HTH a bit already.<br>
<pre class="moz-signature" cols="72">--
With kind regards,
Geoffrey De Smet</pre>
</body>
</html>