From da33af3eb77bec19b00f2fb6cd96b8aad2efdaee Mon Sep 17 00:00:00 2001 From: Tiago Oliveira Date: Wed, 5 Jul 2017 21:10:32 +0100 Subject: [PATCH] Fix push command to use the force flag --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 95b5790..2ccc8fb 100644 --- a/README.md +++ b/README.md @@ -45,9 +45,9 @@ We use [Feature-branch-workflow](https://www.atlassian.com/git/tutorials/compari git add ... git rebase --continue ``` -* Push your branch +* Push your branch. Rebase will change history, so you'll have to use `-f` to force changes into the remote branch. If someone else is working on your branch, use the less destructive `--force-with-lease` ([Here is why](https://developer.atlassian.com/blog/2015/04/force-with-lease/)). ``` - git push + git push -f ``` * Make a Pull Request * Pull request will be accepted, merged and close by reviewer