Author: schor Date: Mon Sep 9 17:59:06 2019 New Revision: 1866704 URL: http://svn.apache.org/viewvc?rev=1866704&view=rev Log: no Jira - clarify some info around protected branches and pull requests
Modified: uima/site/trunk/uima-website/docs/git-svn-notes.html uima/site/trunk/uima-website/xdocs/git-svn-notes.xml Modified: uima/site/trunk/uima-website/docs/git-svn-notes.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-svn-notes.html?rev=1866704&r1=1866703&r2=1866704&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/git-svn-notes.html (original) +++ uima/site/trunk/uima-website/docs/git-svn-notes.html Mon Sep 9 17:59:06 2019 @@ -334,7 +334,11 @@ <p>A <code>git push</code> transfer the changes from the local repository up to the the remote one, provided that those changes can be done using fast-forward. Otherwise, like SVN, this operation fails. Fix this the same way, by doing a git pull - and addressing any merge issues.</p> + and addressing any merge issues. + + <ul><li>Note that protected branches (such as master) cannot be "pushed" to. Instead, you must create a + "pull request" and then later merge that pull request with the protected branch.</li></ul></p> + <p> The local repo can be configured to talk to any number of other local or remote repositories to sync with them. Modified: uima/site/trunk/uima-website/xdocs/git-svn-notes.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/git-svn-notes.xml?rev=1866704&r1=1866703&r2=1866704&view=diff ============================================================================== --- uima/site/trunk/uima-website/xdocs/git-svn-notes.xml (original) +++ uima/site/trunk/uima-website/xdocs/git-svn-notes.xml Mon Sep 9 17:59:06 2019 @@ -138,7 +138,11 @@ under the License. <p>A <code>git push</code> transfer the changes from the local repository up to the the remote one, provided that those changes can be done using fast-forward. Otherwise, like SVN, this operation fails. Fix this the same way, by doing a git pull - and addressing any merge issues.</p> + and addressing any merge issues. + + <ul><li>Note that protected branches (such as master) cannot be "pushed" to. Instead, you must create a + "pull request" and then later merge that pull request with the protected branch.</li></ul></p> + <p> The local repo can be configured to talk to any number of other local or remote repositories to sync with them.