Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

How do I visually "hg rebase --continue" in TortoiseHg Workbench after a Pull->Rebase operation?

I'm using Mercurial and after I pull changesets from a remote repo, I do a rebase (to keep it easy to sync with SVN).

If there are merge conflicts during the rebase, I need to execute hg rebase --continue after I fix them up. This isn't a big deal, but I'd like a "visual" way to do this since I'm hoping to move my teammates to Hg and the command-line is too frictious for everyone to learn.

How can I execute the continue option during a rebase using only the TortoiseHg Workbench (v 2.2) GUI?

like image 933
codekaizen Avatar asked Nov 10 '11 19:11

codekaizen


1 Answers

In TortoiseHG you can do a whole rebase using GUI so you don't need to run hg rebase manually. Just right click on a revision and select Modify history->Rebase....

If you already started rebase and want to run rebase --continue via GUI, just run TortoiseHG, right click on any revision and select Modify history->Rebase.... TortoiseHG will detect the unfinished rebase and will run rebase --continue automatically.

like image 129
Ruslan Yushchenko Avatar answered Oct 26 '22 01:10

Ruslan Yushchenko