How to do Git Merge or rebase
-
wrote on 23 Oct 2012, 08:01 last edited by
Hi,
QtCreator 2.4 question (linux 64 OS):
Is there a way I can do Git merge (merge one branch in another one)
or rebase (if I have one branch based on master and I do git pull, can I rebase it to be on master head)It can be done in linux terminal, but can they be done from the gui?
Regards,
Petar -
wrote on 23 Oct 2012, 08:46 last edited by
We do not yet have a UI to handle merge conflicts yet. So no, this can not be done via the UI at this time. Patches are welcome and somebody is working on a diff plugin for 2.7, so that we will have the necessary infrastructure to plug into to do this.
-
wrote on 24 Oct 2012, 11:20 last edited by
Thank you for your answer.
-
wrote on 5 Oct 2013, 16:31 last edited by
So, is the newest Qt Creator now support git merge in that's GUI? Thank you.
-
wrote on 11 Oct 2013, 17:48 last edited by
Yeap, Qt Creator 3.0 will include better support for that. I have to admit that I never tested this myself though:-)
-
wrote on 15 Oct 2013, 20:06 last edited by
merge and rebase can be done from branches dialog. In case conflicts appear QtCreator allows auto opening of mergetool, and after all conflicts are done user is prompted to continue.
also, in case merge or rebase is in progress in repository, it is possible to run merge tool, continue or abort from tools menu.