#Sourcetree resolve conflicts code

That means that anything you push to the branch you used for your pull request will be added automatically to the pull request and tests will run again. Important: note that little text “ Add more commits by pushing to add-webp-image-support branch on mnakalay/concrete5.” You can close the page and come back later or keep staring at it. It might take a little while depending on what you submitted.

#Sourcetree resolve conflicts code

GitHub will run a set of tests to check for code quality, possible conflicts, and other things. When ready click the big “ Create pull request button” and wait. Explain any caveats, any possible non-backward-compatible changes… Explain what your modifications do, screenshots are always welcome. Once you’re ready make your description informative and detailed. As of this writing, Concrete5 has 68 pull requests so the core team is not going to spend time reading every detailed explanation before deciding which to use first.Īs for the description, the text box is populated with recommendations to follow before submitting your pull request. Make sure you give your request a meaningful title that is informative at a glance. GitHub is pretty smart so you will most likely have all the right options selected by default for our scenario. Which branch of that repository specifically.Which of your repository holds the code you want to merge.Which branch of this repository you want to merge your code into ( Concrete5's contributing guidelines state it must be the “ develop” branch).Which repository you want to send your pull request to (could be your own as well).Later other tests will run but for now, there seems to be no reason why our code would conflict with the branch we want to merge into.įrom the 4 dropdowns presented to you, you’ll have to select (left to right) You’ll also notice that, at this point, we’re able to merge.

The first thing you’ll notice is you’re back to the original Concrete5 repository, not your fork anymore. You’ll be taken to a new screen where you’ll have to make choices and give details about your pull request. So let’s click on that big green “ Compare & pull request” button and do just that. GitHub is letting me know a new branch was pushed and offers to open a pull request.įor memory, if I want to merge my branch into any other branch, mine or others’, I have to send a pull request. I went back to my repository in GitHub and was welcomed with this: I sent a pull request to add support for the Webp image format in Concrete5 so don’t be surprised is you see a different branch in the following screenshots. Just an example, not real code.īecause I didn’t want to send Concrete5's core team an official pull request for bogus code, I started working on a real feature. You might have noticed that, until now, I worked with a branch introducing a target attribute in Concrete5's CKEditor’s link plugin. Posted by Nour Akalay on DecemUpdated on October 8, 2020.

You have to ask the original project owners if they’d be interested in using your code. Finally, you pushed it back to your remote repository in Github and now you want to know if you’re worth your salt. This is it! You have forked an open-source project in part 2 and cloned, branched, and worked on it locally in part 3. The Git and SourceTree beginner's guide to contributing to open-source projects in GitHub - Part 4 - The Pull Request