4

Is there a way to merge two branches interactively in SourceTree or git? i.e. during merge, can I pick interactively/visually one hunk of file A from one branch and another hunk of file A from another branch and merge them together?

Haris ur Rehman
  • 2,593
  • 30
  • 41
  • With git you can just specify an external merge tool, see e.g. http://stackoverflow.com/questions/137102/whats-the-best-visual-merge-tool-for-git – Ismail Badawi Aug 19 '14 at 20:41

1 Answers1

0

Yep you can do it.
Once the file is committed stand on the file and choose the hunk buttons as displayed in the attached image

enter image description here

CodeWizard
  • 128,036
  • 21
  • 144
  • 167