Menu
I'm new to Git and Github. I have a repo with 2 branches: Master and Develop.
So after developing some new features, I created a pull request and merged the develop into the master branch. But when I select the development branch, GitHub tells me: "This branch is 1 commit behind master." But why? I understand that the pull request is handled as a commit to my master branch, but the warning doesn't feel right to me.
Or to make it short: How can I bring my master branch up to date with my development branch without causing warnings/conflicts?
Thanks.
547
After receiving the pull request, the project maintainer has to decide what to do. If the feature is ready to go, they can simply merge it into main and close the pull request. But, if there are problems with the proposed changes, they can post feedback in the pull request.
You can have head branches automatically deleted after pull requests are merged in your repository. Anyone with admin permissions to a repository can enable or disable the automatic deletion of branches. On GitHub.com, navigate to the main page of the repository.
A pull request signals that you want some changes in your branch merged to a target branch. One example might be that you make a new branch "my-feature" based on the current development branch (say, "master").
Once you've created a pull request, you can push commits from your topic branch to add them to your existing pull request. These commits will appear in chronological order within your pull request and the changes will be visible in the "Files changed" tab.
To make it clear what solved your problem:
unchecked the "Include administrators" option
And now you was able to push as always.
85
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
