Yes, you can. In this case your commit
will be put as last commit after existing commits and your commit
will receive new commit ID.
Few other points:
- If there is some conflict during rebase, the command "git rebase
upstream/master" will fail and it will show you which files are
conflicting. So in this case you need to manually resolve
conflicts like:
git add some/path/ConflictingFile.java
git rebase --continue
- For the case you already pushed to github and then you rebased,
the commit numbers of your commits won't match, so you need to do:
git push origin master --force
Marek
On 29/02/16 17:22, Bill Burke wrote:
can you do that after you've committed your local repo without
screwing anything?
On 2/29/2016 10:23 AM, Stian
Thorgersen wrote:
I just do:
git fetch upstream
git rebase upstream/master
And that's it
--
Bill Burke
JBoss, a division of Red Hat
http://bill.burkecentral.com
_______________________________________________
keycloak-dev mailing list
keycloak-dev@lists.jboss.org
https://lists.jboss.org/mailman/listinfo/keycloak-dev