Some tips derived from experience:
On Fri, Apr 20, 2012 at 12:38 PM, Scott Le Grand <varelse2005.gmail.com>wrote:
> So the correct answer here was git push origin <commit_id>:spfp-dev?
>
These sorts of issues only pop up if you reverse history in your local
branch -- if you do this, and your local branch diverges from your remote
branch, git will not let you push to that remote branch peacefully. My
advice here -- never reverse time. If you need to reverse a commit, create
a reverse-patch using git-diff and commit that as a new commit rather than
rewriting history. I would rewrite history only if you are 100% sure that
your changes are not published *anywhere* except your local repository.
I have a git page on my Wiki (linked to in the Coding section of the Amber
Wiki now), that hopefully has most of the information people would need.
For specifically reversing commits, here's my advice:
http://jswails.wikidot.com/using-git#toc17 (expanded recently to be more
explicit)
Noted for the future if so and I sincerely apologize for the breakage...
>
Like Dave said, it was an easy fix. Furthermore, because git is
distributed, it doesn't matter of the gitosis repo blows up -- there are
dozens of full copies of the repo out there which can easily be used to
rebuild gitosis (still preserving the whole history).
All the best,
Jason
--
Jason M. Swails
Quantum Theory Project,
University of Florida
Ph.D. Candidate
352-392-4032
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Fri Apr 20 2012 - 14:30:03 PDT
