Am 16.01.2017 um 09:00 schrieb Fred Cooke: > No, not correct in my books. > > git checkout BRANCH # Assuming it's local already > git fetch upstream # risk free, unlike pull! > git rebase upstream/master # diff difftool merge mergetool settings are > useful, prompt = false and specify your diff tool in advance > git push --force upstream BRANCH # After verifying no one has pushed to it > # create pull request/email someone/communicate your intention to have it > merged > > ^ correct in my books, others may differ.
I merged pull requests from others in the past as well. Create pull requests for master even if I am a committer? Really? That would mean I would create a pull request I will pull in myself afterwards? Leave the merge commit so that the merges can be tracked back to the PR? Regards, -- Christian --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
