Back to Discussions

How to merge a different version with the master

Hi,

I am new to Penflip and version control in general and am liking this so far :)

So I was using it for my own purposes till now but have started collaborating with a different user now and ran into some doubts.

He is working on a different version from master and has made changes. I have viewed the changes and now want to merge them into the master version but I cant find a way to do it. Does he have to raise a merge request for me to accept it or can I do it proactively from my side, now that I like his version?

Regards

Started by abrain Discussion started Aug 11, 2014