Wouter, --On 21 June 2011 18:02:05 +0200 Wouter Verhelst <[email protected]> wrote:
> It's always possible. However, doing 'git rebase' is painful for anyone > who's already pulled from you before the rebase was made public. Well, for what ever reason, rebase wouldn't work (it complained about a conflict on everything) so I did a "git checkout" of head, and reapplied a503252fffcea5b3827c429dff005b9f278b23b4, which is the temporary file patch (the only one you haven't taken), and did a "git push git.alex.org.uk". This claims we are now in sync, though I can still see my old revert commits in the repo (but not on my local machine). On my local machine, a git pull from you says I'm up to date, a rebase says there's nothing to do, and a push to my repo says the repo is up to date. Have I fixed it, or do I need to do more? -- Alex Bligh ------------------------------------------------------------------------------ EditLive Enterprise is the world's most technically advanced content authoring tool. Experience the power of Track Changes, Inline Image Editing and ensure content is compliant with Accessibility Checking. http://p.sf.net/sfu/ephox-dev2dev _______________________________________________ Nbd-general mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nbd-general
