Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Lock account #5564 #5643
@aka001 Looks like the rebase went a bit wrong. Let's try this:
git remote add upstream git:://github.com/diaspora/diaspora.git git fetch upstream git checkout 5564_lock_account git rebase -i upstream/develop # Drop the line with my commit # Choose squash for the now second line # Save & quit # You'll be in some conflicts, git status shows them, once you cleaned them out use git add to mark them resolved, once all are resolved, use git rebase --continue, that might be needed more than one time git push -f origin 5564_lock_account # Later, you can edit the last commit with git commit --amend git push -f origin 5564_lock_account
Please also add at least one controller test per new route.