diff options
author | 2021-03-09 06:38:41 +0000 | |
---|---|---|
committer | 2021-03-09 06:38:41 +0000 | |
commit | 5b10fadd489732ca87d7cc365aceb4415392f19b (patch) | |
tree | d4cb7f85548f02d21fa35de4c231c951ee0b547d /0bs1d1an.html | |
parent | 2021-03-09T06:15:01Z (diff) | |
download | repos-5b10fadd489732ca87d7cc365aceb4415392f19b.tar.gz repos-5b10fadd489732ca87d7cc365aceb4415392f19b.tar.bz2 repos-5b10fadd489732ca87d7cc365aceb4415392f19b.zip |
2021-03-09T06:30:02Z
Diffstat (limited to '0bs1d1an.html')
-rw-r--r-- | 0bs1d1an.html | 52 |
1 files changed, 7 insertions, 45 deletions
diff --git a/0bs1d1an.html b/0bs1d1an.html index 8564ace20953..083fcf856a01 100644 --- a/0bs1d1an.html +++ b/0bs1d1an.html @@ -36,58 +36,20 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> 'status': 'unofficial'} </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync 0bs1d1an + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync 0bs1d1an </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/0bs1d1an'... </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>fatal: unable to access 'https://gitlab.com/0bs1d1an/0bs1d1an-overlay.git/': The requested URL returned error: 502 </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing 0bs1d1an </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>!!! failed syncing 0bs1d1an </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase -</pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only -</pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default -</pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, -</pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per -</pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. -</pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>fatal: unable to access 'https://gitlab.com/0bs1d1an/0bs1d1an-overlay.git/': The requested URL returned error: 502 -</pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing 0bs1d1an -</pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>!!! failed syncing 0bs1d1an -</pre></td></tr> - <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync failed with 1 + <tr class="err" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync failed with 1 </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Will try to re-create -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint sync 0bs1d1an -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/0bs1d1an'... -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>error: RPC failed; HTTP 502 curl 22 The requested URL returned error: 502 -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>fatal: the remote end hung up unexpectedly -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing 0bs1d1an -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>!!! failed syncing 0bs1d1an -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync failed again with 1, removing -</pre></td></tr> </table> </body> |