0

Let's say you've got 2 branches A and B.

I want to merge B into A but it does an automerge. So I checked out A and then tried 

`git merge --no-commit B` to turn off automerge

But doing it this way, the merge isn't concluded but already happened. Is there a way to merge only certain lines of code of B into A? Preferrably with the webstorm mergetool?

Vincent
  • 6,058
  • 15
  • 52
  • 94
  • I just found the following method in webstorm: git->compare with branch. This way of working is ok, but than with a commit (merge) message. Is that possible? – Vincent Nov 18 '14 at 10:39
  • I recommend you the following http://stackoverflow.com/a/20256067/568901 – sangheestyle Nov 18 '14 at 10:43

0 Answers0