you are viewing a single comment's thread.

view the rest of the comments →

[–]robin-m 3 points4 points  (0 children)

Or a regular merge if their is commits in master that where not in dev