Skip to content
  • Categories
  • Recent
  • Tags
  • Popular
  • Users
  • Groups
  • Search
  • Get Qt Extensions
  • Unsolved
Collapse
Brand Logo
  1. Home
  2. Qt Development
  3. Qt Creator and other tools
  4. How to do Git Merge or rebase
QtWS25 Last Chance

How to do Git Merge or rebase

Scheduled Pinned Locked Moved Qt Creator and other tools
6 Posts 3 Posters 6.8k Views
  • Oldest to Newest
  • Newest to Oldest
  • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • P Offline
    P Offline
    pperisin
    wrote on last edited by
    #1

    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

    1 Reply Last reply
    0
    • T Offline
      T Offline
      tobias.hunger
      wrote on last edited by
      #2

      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.

      1 Reply Last reply
      0
      • P Offline
        P Offline
        pperisin
        wrote on last edited by
        #3

        Thank you for your answer.

        1 Reply Last reply
        0
        • A Offline
          A Offline
          Ade Malsasa Akbar
          wrote on last edited by
          #4

          So, is the newest Qt Creator now support git merge in that's GUI? Thank you.

          1 Reply Last reply
          0
          • T Offline
            T Offline
            tobias.hunger
            wrote on last edited by
            #5

            Yeap, Qt Creator 3.0 will include better support for that. I have to admit that I never tested this myself though:-)

            1 Reply Last reply
            0
            • P Offline
              P Offline
              pperisin
              wrote on last edited by
              #6

              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.

              1 Reply Last reply
              0

              • Login

              • Login or register to search.
              • First post
                Last post
              0
              • Categories
              • Recent
              • Tags
              • Popular
              • Users
              • Groups
              • Search
              • Get Qt Extensions
              • Unsolved