Re: Question about pull-requests

lix -- View this message in context: http://git.661346.n2.nabble.com/Question-about-pull-requests-tp7648649p7648733.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.ke

Re: Question about pull-requests

On Mon, Feb 22, 2016 at 05:24:15PM +0530, Nagaraj Mandya wrote: > In our GIT repository, all users are restricted from merging to > master without a pull request. This works well and all developers are > raising pull requests and merging. However, if there is a merge > conflict during the merge,

Re: Question about pull-requests

On Mon, Feb 22, 2016 at 05:24:15PM +0530, Nagaraj Mandya wrote: > Hello, > In our GIT repository, all users are restricted from merging to > master without a pull request. This works well and all developers are > raising pull requests and merging. However, if there is a merge > conflict during th

Question about pull-requests

Hello, In our GIT repository, all users are restricted from merging to master without a pull request. This works well and all developers are raising pull requests and merging. However, if there is a merge conflict during the merge, we have a problem. We follow the instructions provided by Bitb