首页 技术 正文
技术 2022年11月12日
0 收藏 968 点赞 4,329 浏览 37087 个字

转载 git 提交解决冲突 http://www.cnblogs.com/qinbb/p/5972308.html 一:git命令在提交代码前,没有pull拉最新的代码,因此再次提交出现了冲突。

error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

<img src="data:image/png;base64,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" alt="" />

解决方法如下两种:

1.保留你本地的修改

git merge –abort

git reset –merge

合并后记得一定要提交这个本地的合并(add–>commit–>push–>pull)

然后在获取线上仓库

git pull

2.down下线上代码版本,抛弃本地的修改

不建议这样做,但是如果你本地修改不大,或者自己有一份备份留存,可以直接用线上最新版本覆盖到本地

git fetch –all

git reset –hard origin/master

git fetch

二:从git远程仓库中pull最新的代码,出现如下错误:Please commit your changes or stash them before you merge.

<img src="data:image/png;base64,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" alt="" />

解决方法如下:(git stash 可用来暂存当前正在进行的工作, 比如想pull 最新代码, 又不想加新commit, 或者另外一种情况,为了fix 一个紧急的bug,  先stash, 使返回到自己上一个commit, 改完bug之后再stash pop, 继续原来的工作。)

1: git stash //暂存代码

2: git pull  分支名//从远程仓库拉取最新代码

3: git stash pop //合并代码到本地仓库  此时代码是将暂存的代码和远程仓库的代码合并,如下图:

<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAR4AAAHNCAIAAABHAYMAAAAgAElEQVR4nO2dP4/jSJLF9VlkFOmOMc4s0MA5dwNUtSGz19ixBge00Ss0RjLG6TEPY2wVyuKHOE8WrXPXllXC+vsBylJ7Z5CS8k9EZJLMJBnUA35Gd6WSTFL5FMlkvoxVUa4BAMlZTd4CABYJpAVAFlJLq/j0/eHrqfhh8gvrx6Y6ns/v5/Ox2kzfGKCaJUqr+PT94dOuR8X9AaICqVj97S/TNyIxfaW1qY7n0+tm8vaDRbD68nH6RiQG0gIzIJ20ik/fH7421IX596fTw6eq+PX7w9fvD0+b9mNt1989fD0VP+wuFR1JbNpaX9u61rmeNuWH2j6j/fmW+NEppAUSknxA+KEmpNWI6vIP4zMXUX0oynVR/lDd/t0UXZXWFF3U1erz1+qmKEOTfaPWrn4/19vJvxKwDJJPvpPS+rUqWo3VhfWZnaGlojRUcfuwd5z2Y5d/O0VlH2nt6vfz+b3eT/99gMUwQ2ldP2yoxTmyLJ6eUeuxOiFqgWTMUFqRUSu5tPCsBVIyK2l9qI1ZB+pZ6/LJgLQ8WcYBaYGErJ5fPj+lONDOm5prlRCW1g1HDzv/aA2huGROFWKGEEzCxGsI3QHhpEBaICGQlgEWOoF0QFoWWJ4LUgFTCQBZgLQAyAKkBUAW0kjrP//rPya/EgBmBaIWAFlA1AIgCwqj1ub17fx+vmFPlO8PZ6v0/a16NCoys+pcLfdc9hmFc43ZeDBL0vi1Ro1am9c30wCyP1hdcH84nw/0GqiAtJhaQt1grXEaD2aJQgO/0zvb97yXHqlLWkkaD2bJ6qcUR5kyajl/0SatBI0Hs0Trs5btCN7W12GV97hy+2SXZy3XccxKS6w1TuPBLFl9++XH4UeZOGq5vVNV1BreeDBLVs9/fEoyJhwPDAiBBlbPf/95+FGmjVqYxgAzROHuuXbvbGwg9nS2GmmlaXy5Li6bUoVfrIGxULgaw33ravfFwFtX++Xv1VMcfPkbN43R/ZVxisabdeGSng0KZwgBzbaGtOaEwqgFKNyxJZgaRK301MSyQ2oIl4xtjU0H5geiFgBZQNQCIAuQFgBZgLQAyAKkBUAWIK0xGDMpHhLwzQRIS4ReTdt5mrtDd++xeKr3uZIzuPFLIo+0iqcTl0lk/kUmkFYnIC2DDNIqPrGpd+Zf5ABpdQLSMkgsrSaxFZk2bv5FBKK0dvX7W/XYLDkPr7U1u7tZdFmiccnkwK/3NWs54hHOxeAo0PyvfF12O9uiQOP3h/PpddOuGvHs2JHXdV3Lsnl9Ox+q5oyn1037mdlJOqW0dg9fv7sJiNUU0YSkZfQGKxWy5cJy+vHm9e3WgbY1oTqil9gHjD6X8GWJ0uKuKxCXuNK297f3zWywcF3sjWpMAKfXzfUf5bae3/rJVNJqEqKSTy/zL+IJSotWhftNC92dP4jJY3XyI1jncwnndaXFNWl/kBYBS9IyRtG3eyhcF9/ga/Xbt7Nkaa2L2cSfUaOW2wWdr/xyXuuTj9XJHjuFpbWllvwedlQL80jLEQbjT5OkRQqGvy7hRmmR1vPLn0l2nmmYyVNTsmct/zszekmvqPVYnawl8HFRS+g640Ytk83rG/E02FlazHXxN0qLtNIfdCZzfUlmCJtv9PYFWw8Ddhc0Nmayal1+etlHF7sfE1s+rQvvgYppoXMuCfOA9sOVdF023nCOabwwzOOvi79R9yutcjZvqIa/1yrXxbXneYM36+/UFmjXUdOmOlpP58as184sKteFPdtmdlx3Fs55xCfPJWEMxuqtWUu4LqcNvuToxouTH+x1cTfqrqV1Hyx1SdFSr2tkIK3+LLULLvW6RgbS6s9Su+BSr2tkIC0AsgBpAZAFSAuALGBHJwCygKgFQBYQtQDIgsJMJS3Wyk4n8TaxYsBPR9Bhx1n6XM6qBXNpglPENyOuARG1iEwlEZeM/Cb50Bm1nMT15WN1ikhR1dDVJsyfy3VhxeQ3cVbZuQcX2izX2tbnY1Ud6L2v2UsWa4FhaHzWshduOiSWlnQuwirifDIoLXHdbYdaho2XWErHXbJcCwxDYdRy7ENEaTppieeypEV6BCOkxa4Wd48j1Wos926TQpccqAWGoS9qBX7mhST2DV2kJZ/LfqDiHE0haUmujcha2/p6FvKXhb7kUC0wjFUSH+SYUcvbWcHu2Umjlnyu24+9ZBbML639wd6SJe7XJFgLDCNNmvBR8Qdp7uYNOQeEjMv4OrgKnCvDgLDPI19MLTCMNNIad4bQ+5nPJy3xXN6zVsRILP00hry9BHfJEbXAMFS+15IS16eefBfO5f/wd518j82SKtTyrzdmW9KIWnjlNRCFM4QNXCp7IYn9rWLH7W+Zc1HbsxiDtKhXxnGBgq9FTe55ozvvkqNqNXcSr7z6om+GEIzFtoa0BqA2aoHMxA5WAQOi1pp6oH8ffyw0k2YU5foyydE5awQwQdQCIAuIWgBkAVELgCwgagGQBUQtALKAqAVAFlZfPiY4yiRRK8KyTmeF6lBUiss7Qis/uBayq5C4lSKDdh8A06A3alHmc8Ho3q+oFBclBtYrRrSwjJMW+WEwb9Q+a5Hmc2GFeL+icoC04loIaS0VrVGLNp8LvqZ+RWV/aXVpIaS1QFZPKY4yetRizOeCG7dfUSnuCCBJK7qFkNZCWT3/8emnqRvRGc58nktaQtRi5hXiWwhpLZTVt5ffh7shR45arPl8NgPCji2EtBbI6jmFtMaFN5/PZRpDsMd7m/65w0VIayEo3BtDMJ8LRvd+ReTphJYEW9gEtNt0vO3thbQWhL4ZQsl8Ltjj+xWVwVfGhLSC9njL3u867UWzFqSlB7XvtQCYN/qiFgAqQNQCIAuIWgBkAdICIAuQFgBZgLQAyAKkBUAWIC0AsqBz5TsAs0dh6joANKAyvxYA8wfPWgBkIZW0PtQPX7+7PG10FAGQHkQtALIAaQGQBQwIp/8OwCJB1AIgC5AWAFmAtADIAqQFQBYgLQCyAGkBkAVIC4AsQFoAZAHSAiAL2IcQgCwgagGQhVUS9/4kUYvLb0/nkhOKnPwGzjGFdAqXtCZMwkiqlp8wwW3MY3XyDuhn5dofyEuwWt7mIjISPtzyPwhF4iUjn0M0eg38Efnt9wenT9NFVLrhYDqStla/DOIl10e3tZ27ZFfTGcA8aVF3o8lteTpS1yIUiY2HtKJJs+3MBFErLr99ZH46NoljGchPZ0cJu3ndpWWn3nI+LEqLvBvtf7c1oRmhCNJKw+rLx+kb0YMu+e3DWVWtg+wPcanrmpFbwqjFazUkLfpuXJS2q/3ksUIRpJUGpTOE0fnt43KB289agdR1Tljwn9xCta5NtWsRLbSK+Cc05m5cg9jm9a0Jhp60qCKx8ZBWNDqjVnx++3hpNT/2/g92MP7cJh7sEVrXqBWSFhu1uLtxGx8+VqdjtaGkRRQhaqVh9fzy+WnwUUaOWh3z23cbEF4HVy1haRnNuHbxEaXFPygaj177w7neUtLyiyCtNKSR1rjw+e2TTGM4HStWWtYBez1r2eJ0P8xJi78b1qzGtj4fdqS03CJIKw0KZwiF/PZ2F2xeOpFjRauI+uGPmXy3sefN+02+Nw85nSbfhbthTxhuquPb6UhJyykaJC3q9dqdom81hpTf3n3cN/qHUOQf05wkZN+fuuEi/kXzpT1kH7UOG3xlLN0Nai6elJb7BjnwytiOkE6YbeqSsffOUDpDCGbLtoa0ynWhMWqBOeOMtO8ZRC2QimZUiUmOFkQtALKAqAVAFhC1AMgCohYAWUDUAiALiFoAZEFt1DJXDAT8Wqbhgl5kwBn4KUeW80pUq9/euWRvSQe9ZEna6UC+LveORS3LVE0aU8nIUctaCGsu3gtLi7fi0wZ+11HPnro9jhq/vW+a9Brjt1Dc6YCr1a6NujTD+e9y0bg3hrP+zei4SaRlG/g31dHpFtaiXrV+e2rZZLCF4k4HXK3N69v5UFXt78KmOtZ7w7u5XBT6tYiexPsde0jLMfDfvB5OT9Ltt6ekdTsI00L5Rgm7Khx2m9e3eluUj9XpsCshrVliD8kaLjaQjs9aVvzhDPzlRSq1/buu3G9PDAit/9K/R+KNEnZVOOwaUbUCg7SiGTNqDZNWKGoxn2lWnfp7Hur12zsTEm5r6RaGdjoga13+3rjCfCPZUtH3rEVJy/hRHzwgdA38/nFuf1Hst6eMXmSRNQwWbhRb6yq5Nnyt70Va+mYIQ252ryjcBSUD/+2ki/Lb89ISWijcKL7W3p1mbG7d8qU1eQt6YG9ba00n2LN2kZt1igb+hsX57VlpSS3kbxRfa1MdSWm5EW9xtn+tqzHMRwXptaZny2dfGXMG/obF+e05aYktZG+UUCtGWou0/auMWi23sTvQzgJt/1qjVlGu7R+/bb2sL+auWKTtX3PUKtfmeGxhX8zdsFjbv+qoBcB80R61AJgpiFoAZAFRC4AsIGoBkAVELQCyoDdqUcsgSn5pQsDo0edcgpvdtcezzYhrQEQtYq1QxCUvcoXRTFh9++XHyRvRmf3B7hCNwe5a1D37Tq9zhdzsEevl3YMLbZZr0X770CWLtcAw9Pm1CN+4SWJpSecKuNnJc4kZ9MQ2i7UYv33gkuVaYBir55ff//aX6dvRAW93JK80nbTEc8ludvpcYt5Xsc1SLc5vL19yoBYYxurby5/DLVtTu4wNBDd7QxdpyecK2P7Jc4nZylkCtVi/vXjJoVpgGGmkNSZmd2+WdVo9O2nUks8VtP2PJC3eby9dcrAWGMbqW4oB4eg7OtkdJdJy2zBwQGgcP43tf/CAsM8jX0wtMIw0acLHxfuZzyct8Vx9bP/ppzEkvz1/yRG1wDAU7o3h23sySks6Vx/bvy2SWJ+SUEv027PNiKiFV14DUbsaw30fGuFmv1Xs6A5iziXY/qNfGccFCr6W7LfnLjmq1hJN9WOidzUGyM0CTfVjojZqgcws0lQ/Johaa+qB/n38sdBMmlGU6wWb6scEUQuALCBqAZAFRC0AsoCoBUAWELUAyAKiFgBZUBy1IizrbhJHyQNvLuNwUoyaFePzM3C1wH2gN2qxyd5po7vogbfXyFrZR6VM9bFZhbCs4R5RG7XYZO/MCvEuReaiOylTfay0Qs5osES0Ri0+2TvjaxKKCIXcvCRSpvpu0oJl475QGrWEZO+MG5cvknOrSZnq+c0CxPz24C7QGbU483kmaXE7bchRS9ifA9wBKqMWaz7vNSCkfL63Rzhpt6P4ASG4PzRGLd58nmoaw5h1gLRAPxRGLcF8LhjdRef8rn53Jt/ZDOJyS8p1uNbtjLDHL5k0286MGbUk87lgjw85582nI3eLCEla/CtjOWrBHr90FEathYD3yAtH47PWEoA9fvEgao0P7PF3AaIWAFlA1AIgC4haAGQBUQuALCBqAZAFRC0AsqA4aiU08DsL1b2sP2ypkc/OXsbB1XKb4TUG+wgshZWyRMY3Uhr4fT/lTT8B5whjcOyViwj7CCwJlfm1ijKpgV9Okch2XDFRag9pYR+BZZFGWuOT0sBP5Hdk8uJZPFanpFEL+wgsizQDwtGjVkoDf+E+k9idj3fpG84xces10mjsSQv7CCwMnTOESQ38hdkF/d/18C99E7782YhuUQv7CCwMlTOEaQ38zgGvQ82W2EHUY3WKmlowzu5JC/sILAiNUSu1gZ941jJ6avTziaWNJNMY2EdAMwqjViYDvx0GYybfbfznn86T79hHYEmsnl8+P03diE7kMPBTM2kX4bEvZN3gGf+i+dIeYh4c+wgsBoVRC6QE75FzofFZCyQD+wjkA1HrbsE+AnlB1AIgC4haAGQBUQuALCBqAZAFRC0AsoCoBUAWdEatWHu85NLna8FUDxKg06/FrZoTXfrGZ5iXOTDVg3TodBlHSot0anSSFkz1oC+r4cm1itlGLfYv0dKCqR70ZSHPWmGX8fUvXaQFUz3ozerbLz8OP8p8o1ZuacFUDxjSJFwdm7EGhDDVg96snv/+8/CjzDZqpZ/GgKkexKFz99w4adFmpI6T7zDVg37oXI0R+8rYc+nDVA/GQucM4cLBe+QloDNqLRqY6pcBotasgKl+OSBqAZAFRC0AsoCoBUAWELUAyAKiFgBZQNQCIAtqoxZpqpcX40ab6q9/p1Kq+m5iePsBgcqoxZrqw9KKWNe3eX1z0pEYXdw8Nbz9QEBj1LrZOlquq9GTSMtMM9nq53IEObkrvP3AQGHUEkz1SaRlJtcq10YmVUty8PYDGX1Ri7InXpy/HZ+1LFM9s17+cpD3urZiCLz9QEZf1BomrVC4YD7TLJk1TSjw9gOZZUSty9NXigHhrqZsiPD2g46snl/+TLLzzHhIpnpyhqPjQw75MXj7QUf0Ra0iaKq/jdOCEw/GAe0ZwhgDMrz9QEDfs1aD+VjidDXriSX+Xa33yZh9oODtBxwqo1bL5vXt7uam8R5ZDVqjVlGu7ZHbtr6DDgdvvyI0R61yfXG838NUNbz9ylAdtQCYL9qjFgAzBVELgCwgagGQBUQtALKAqAVAFnRmKinvzsAf9PaTa6C46xJrOW+lH6mbAMKojFp3aOAPefu39flYVQdnoQZ/XXytNtuLZazG+7QeaHzWukcDf8Dbv2/k4d4Z4brYWpvXt/Ohqo6NCDfVsd5va0irOwqj1l0a+GVv/9Vj5nxMvC6mVrMyc/P6Vm+L8rE6HXYlpNUHfVHrPg38orff6Pqe5PjrYmq1i54fq9NVYJBWH1ZJfJBTu4yXb+APHPDaEvsOSNfF1br8fVMd307Her8mRuAggjRpwsfkPg380UXWqFW4LrbWVXI3zw6k1Yc00hr1WesuDfx80W3tvz/246+Lr7V3pxkb4UFaXVH5XusODfxskX80Q/PsdfG15IGuceHYRyCAwhnCcl3cn4GfK6L+fvtB4a5LqBUjLewjEIO+GcIb92jgnwnYRyCM1qhVlOs7NPDPBOwjEIPmqFWu78nAPxOwj0AsqqMWAPNFe9QCYKYgagGQBUQtALKAqAVAFhC1AMjC6svHBEeZIlMJteRCWJ7bumUdQpPIQb9jV1O92wyjAXIL+TUcMs07KHfJSMTdiGh8mhYuFZVRi3Wzyyvfub8IdLASx5nqnQPuD0QXJFvYK6+xvcqRu0DybtA7AiRv4YJR+azFutmnlFacqd47IGFOSdZxrRXD/AVSd4PZESB1C5fMAqKW8aVOL62QqZ4+YMRS4D4dN2IzJn7ZMb0TQeIWLpnVU4qjTBq1ond04v4i0HVAGDTV+wf0YwvbcXmjMct1IRhzyfTdYHcEyNDCxbJ6/uPTT1M3oiusm318aXU11Q+SVu+Y0IQvSmDcuZgdAbK1cIGsvr38PtwNOfGz1pVpB4RsCw1H5qgDQofr1lSBcwW2WMvYwkWxek4hrZGR3eyBPV46SUs8YB9T/ajTGC5x55J2BMjdwiWhcG+MYLjgDPwN3aQlHbCPqd6WFm18ytVx3Z2A6XOJOwIMaeG92f4XMUPol/KvcbtKSzhgH1O9+9aV6otxkwQRfdSNPzE7Vck7Agxq4Z3Z/lW+1wI6uS/bv8qoBTRyb7Z/RK019dT+rmXooqTx92j7R9QCIAuIWgBkAVELgCwgagGQBUQtALKAqAVAFlSufG8YZo/3J4Kvy8NdozuX6YdtRjvXbKy0uC0CEorEBQ3dF5GAaVG5hrAo153t8QHnvLu+blcz3kpXWqTRfVuf399Ox9vxbWkxReIyPEhLGyrzaxVld3u8uOTcXoNrEJQWbXRv/rutCc0IRZDWotD6rNXZHi8Zpfg9JELSYozurdJ2tZEg2E5eShVBWotC6Qxhd3t8t6ILgU3FOKO7kVu5CYaetKgi0QMPaWlDZ9TqYY8fIC02arFG9+v48LE6HasNJS2iCFFrUaiMWn3s8Z2K/M9c/8LmAjdNTcaj1/5wrreUtPwiSGtRaIxavezx0jQGtWlEgyQtwehuzmps6/NhR0rLLYK0FoXCqNXPHi8755uHnE6T75LR3Zow3FTHt9ORkpZTNEha92aPnz/6olZPe3zYOW9FoeArY9HoTszFk9Jy3yAHXhmLjqw7s8fPH4VRC9Dclz1+/uiLWoDk3uzx8wdRawHcoz1+/iBqAZAFRC0AsoCoBUAWELUAyAKiFgBZQNQCIAurJO79CVa+k6sWRJe+k2mOr+XXhbcfdCaNgX9suLV2vfPbS0Xw9oM+pNl2ZoqoFSGt+MRwfBG8/aAfqy8fp29EZ6KlFZt2jS2Ctx/0ROcMIWd0752EmyuCtx/0ZelRK7O04O0HHKvnl89Pg48y22etoQNCePtBX9JIa2zGm8aAtx/0ZMkzhB3y2wtF8PaDXuhcjRH7ytjqi+wr4ytsH4W3H3RG5wwh6Aa8/ROgM2qBLsDbPwmIWssG3v7JQNQCIAuIWgBkAVELgCwgagGQBUQtALKAqAVAFtRGLXN1QiDhqmnuoBc0OAs1rn+vTn7iBef1K7z9gCaNqWTkqGUvujUM9mFp0cvw/ITIl97puvfZU7fHgbcftGjcG8NZa2d03CTSsjwgjZYuR7CPD28/EFDo1yJ6Ep+VuIe09gd7WdDVV2JJDt5+IKPPr0VYsMrH6hQpLdoDbz9red20OWxtRx54+4GIvqg1TFqhqMV8plnh6m0EAG8/YNH3rEVJy/hRHzwgvI7WLODtBx1ROEMYcs57ReEu6D1rkWNCePtBB1S+19rV784jivWGynnpJGvmWsuOJFEGZHj7AY/W1RjmxIPTM6w5CdNIL78y9j4Ztw8UvP2ARmXUatm8vnG/1iAWePtzoTVqFeXaHrlta/SP7sDbnw/NUatcm+Mx9I9etw6THLlQHbUAmC/aoxYAMwVRC4AsIGoBkAVELQCygKgFQBYURy1ikY67+MD1gHQuKsW1DkKR2EJ2nQe35iPgUgFzZPXtlx8nb0QvKA+803H3h7OdxKRzUSmu0BOKIltYxkmL/DCYN/r8Wi2kB15IXdevqBwgrbgWQlpLZfX88vvf/jJ9O7pCe+CFhKv9isr+0urSQkhrgay+vfw53LI1etRiPPBCmvB+RaVoj5ekFd1CSGuhpJHW2HAe+FzSEqIWM68Q30JIa6GsvqUYEI4ctVgP/GwGhB1bCGktkDRpwseF98DPZRoj0qXvHQTSWhAK98YQPPC2SCwzUr8i8nRCS4ItlLcYGCAtWPHnhr7VGJIH3n21avTvfkVl8JUxIS3RpX/5ALnFQNBvL2gPVvyZoXg1BrCBFX9e6ItagARW/LmBqLUAYMWfI4haAGQBUQuALCBqAZAFRC0AsoCoBUAWELUAyILiqEUv7RHWKwSWET1Wpw6JEcRm2OkOSjcJHVMUTIzQzdtfnbyVJcZrZTsRZpe8E9yGBeJ2Bs1rt/DtXdB2BnqjFpnEvre0tvW5YzofqRnb+vz+djpSS6KEomGZsogPuBdlLjv20yjfLiFyRf/m9S1upwM7aZPT5sX6ANRGLTqJfU9p2UtmnSqitOhmNP/d1oRmhKLk0mq0ZPZUO32zG6k65lOPTV/WJZ86pOUwSX4tKol9P2l1+e5taTHNaJW2q33Tl1CUXlpG6kpbBrS0eqTPjLEIPFJDU+b2QlpTwyWx7yUtwmVsFfHDeq4ZRm7lJhj6qVOJInGzgN79rLm6mnpEdAaEtmbIZtjPWgGLgJdrz3sigrSCjB212CT2WaTFRi22Gdfx4WN1cvKsCkU5ota6uEwhSLkzBXemzU2Q/mcCW8etjYkieozqXgWkNT7SiH9EafHNMB699odzvaWk5RflkhZZRJnKzGsMDwivg+FgLRsjvTqkFWTcqCXY4/s9axlfNlGFk1akS39bnw87UlpukTJpuR+LlZY5Ubnk7QwURi3RHt9z8r15Tug0+S41w+oxm+r4dqI7k12kTVpWwtt4aVnPdQveziDNtjNjRq2APV7wwAfs8VYUCr4yFptBzMUzv9P2G+TAK+O+3v4+0uJfGXsvl42pTrKWG96lp74FbWegMGoBEGb67Qw0PmsBEGAO2xkgaoGFMZftDBC1AMgCohYAWUDUAiALiFoAZAFRC4AsIGoBkAXFUSuZgd996+99xlxnQK7AIM0XtIfXeZXpeZnIc8ktjPbbn+3M6NwB4dJPwkpjIuOiXKc08Dvf/f5g9hgr15ZriWds/94KcW+xleWquP6XPZfYwvDiPf/CxQPCpZ8Ehfm1GhIa+L3vXshqZx6Etf0bvdNWS1P9UFXt3hib6ljvL35K4VxCC8sU0pK2zYBLvydppDU+KQ389Hf/Xu/JnnTtQ3xnuraK7tOH3eb1rd4W5WN1OuyuVmXhXEILyzTSMv8Cl34S0gwIR49auQ38bZ/eVEcvLl2cFIKBsu2dr9XJ+0AjrUZUrcDaa+l4LieROW8ZJi9cPCBc+knQOUOY3cCfQlqUgeLa8sapZZq7hklrcNRypAWX/mBUzhBmN/Bf/uI+KZVra9+YQNTauqOp0vhRaMPX2pJW/LnGGhDCpd8bjVErtYG/0zTGzcDP2/7daQx/30Lzw4/tuFE414TTGHDp90Vh1Epu4Lf7mWP1seeU7akLzvbvT75fjiCN+oRziS0cLi3ikuHSH8zq+eXz09SN6ER6A7/7d7frmI/13giQsv2Tr4zPh11IWuy55BYmeGVsHRAu/SQojFoAtEzv0hfQ+KwFwLqYh0tfAFELaGQuLn0BRC0AsoCoBUAWELUAyAKiFgBZQNQCIAuIWgBkQWXUSuwwF2oJNvK+pnq5hQW5fudePfCqUenXSuwwF2sZZ+nggZcOGDgXtTHBvS4eV41Kl3Fih7lU60LHxeP9pUVuTABpKWQ1PLlWMW3UGu4wl2pd6Gh56i0temMCSEshC3jWGuwwD9RaF2Vno650QElazMYEkJZCVt9++XH4USaLWkkc5jG1+khLiFrMvAK3MQGkpZA0CVdHJrHDPKbWKANC9hkS0lLI6vKVIGsAAATRSURBVPnvPw8/ytTPWgMd5jOZxhA2JrhTD7xqVO6em9xhntwD30da4sYE9+mBV43K1RjpHeah17ictOJnU4LiD2xMcJceeNWonCEE6Zi1B141KqMWSMXMPfCqQdS6WxR44FWDqAVAFhC1AMgCohYAWUDUAiALiFoAZAFRC4AsKIxa4lpVN4FAZBL78lbXd86zHvjAGo7rEnvDVCJlFeKbYSRkMGrdlheyqyiFFmJhYWYURq2gtJwUIWQCNcdv337Yc85Tp7gRcF5R+YHC0iKbsa3P72+nI7VaSigSWwhpZWaJUctdXhiR/a1knPPUKeyD8/YQVqKitOhmNP/d1oRmhCJIa0qWHbWMviXbqzjnPHUK4uAu/D4cIWkxzWiVtqt9P5hQBGlNybKjljEqk03BnHOeOsUNzqUvpDkObGDGNcNIatwEQ09aVJG4jwCklZklRi22J4l+e9I5T53iBhcTQtJioxbbjOv48LE6HasNJS2iCFFrSpYdtYK1iJzzrtHQO8WN1NLim2E8eu0P53pLScsvgrSmZPX88meSnWdGRHKzx0vLSRHPOOfN6vHPWvbGG2IzDGlFGvi39fmwI6XlFkFaU6Iwaolu9khpWT4l0Tlv/KXL5HvzkNNp8l1qhvVrsqmOb6cjJS2nCNKaEoXPWuW64N3ssrTIoBR0zl+qh6cxqPe8sa+MxWYQc/HMjjT2G+TAK2PR9g+GoTJqATB/tEYtAGYOohYAWUDUAiALkBYAWYC0AMgCpAVAFiAtALIAac0I9n33uAdJ0gygMlPJyDSroojV9GWHnEMxQFpLIl3UKp5OD79Whc4inl3tLdU1gbQAQ8oB4e7h6/eHrzXVd+dfxMD7hRsgLcCQ+FlrU/z6/eHrqfhBYxFFsysTIR5nlEgszzWXxtorX+267kLhW6mzXtY8oNP1nWW4scKw9py6Nr5DM4yiZusBY9m0ddP82+VsAUS2nLtRKsgwjVE8nR6+fn/4oLKI4LqAnbJgCG5Ich8Bocp1Ob9hf7x2d3uTHGthvrN/TnTMcfecimmGcF2xjTfzDIrXlXZEMD6rPD7ID/XD1+8PT5RJYf5FJNcfeFtgcV+/l3yZ9iA7qjD+ayeVtc7rGkMjpbWpjpyLhG+G9EmhFp8gV7gu6UapIE2acIuZxJ9kUcvEsw/LRmNukGZ4pcyOxfdO3oDsGcAipRUpGO+/7HUJtfioFfJ3MzdKBamlVXxin2TmXxQBsXshIS1XgbJB03nIKYhazO6IVFEHaXWOWtJ1haRFvr0Qrku6USpI+V5rJnN9SWcIHbznE3qHGf+Zgevu1ogo9offuaibSC4hJeZZi++sAWkx1yXX4vQjXJdwo1SA91oy7ojF/3bNn2TaHn963VVH7ic8bkBIVHS3W7wcbWOcK4Dt4Y9RuHBdUi1vH4GY6xJulAqw0Ankxhv1CZvJLQhIC2SG3qZu+ZtJQVogP+6AUPHbqnggLQCyAGkBkAVIC4AsQFoAZAHSAiALCaXVvrjs92qvWSfR0HsV0lA+//Xf//rtn/+T/Ow//OP/chxWKaPcjVxfZQdWXz4mPWKvt4Gb4tfvD5+mn5D9/Nd//+u3//2c47B//TLlRSU9+8ADpmqPfJxU0nr8+M9//fZvl//+x2O47v8Dp+N21+lfGHoAAAAASUVORK5CYII=" alt="" />

4:这时候需要手动修改合并所需的代码即可。

5:git stash clear//需要清空git栈执行该命令

git stash: 备份当前的工作区的内容,从最近的一次提交中读取相关内容,让工作区保证和上次提交的内容一致。同时,将当前的工作区内容保存到Git栈中。
git stash pop: 从Git栈中读取最近一次保存的内容,恢复工作区的相关内容。由于可能存在多个Stash的内容,所以用栈来管理,pop会从最近的一个stash中读取内容并恢复。
git stash list: 显示Git栈内的所有备份,可以利用这个列表来决定从那个地方恢复。
git stash clear: 清空Git栈。此时使用gitg等图形化工具会发现,原来stash的哪些节点都消失了

三:git push 报错,如下:

git 提交解决冲突(转载)解决命令:git pull –rebase origin 你的分支名称,如下图所示git 提交解决冲突(转载)

再次执行push命令:如下图所示:

git 提交解决冲突(转载)

四:git push 还会报下面的错(如图所示):这多是多人开发有了冲突。

hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., ‘git pull …’) before pushing again.
hint: See the ‘Note about fast-forwards’ in ‘git push –help’ for details.

git 提交解决冲突(转载)

解决命令如下:

git push -u 代码所在的分支 -f  //强制提交,此时远程上的修改已经被覆盖。这种方法一般不建议使用,除非你把远程上修改的代码复制到本地。

五:本地回退历史版本,当提交代码发生冲突或者想回退到某一个版本,操作如下:

1:git log (获取提交的历史日志)

git 提交解决冲突(转载)

2: 执行命令:git reset  –hard  版本号(就是git log 中的  commit后面的哈希值(上图中的黄色部分 commit 后面的值))

3:想要修改远程上的代码还需要执行如下命令:

git push -u 代码所在的分支 -f  //强制提交,此时远程上的修改已经被覆盖。这种方法一般不建议使用,除非你把远程上修改的代码复制到本地。

相关推荐
python开发_常用的python模块及安装方法
adodb:我们领导推荐的数据库连接组件bsddb3:BerkeleyDB的连接组件Cheetah-1.0:我比较喜欢这个版本的cheeta…
日期:2022-11-24 点赞:878 阅读:9,031
Educational Codeforces Round 11 C. Hard Process 二分
C. Hard Process题目连接:http://www.codeforces.com/contest/660/problem/CDes…
日期:2022-11-24 点赞:807 阅读:5,520
下载Ubuntn 17.04 内核源代码
zengkefu@server1:/usr/src$ uname -aLinux server1 4.10.0-19-generic #21…
日期:2022-11-24 点赞:569 阅读:6,368
可用Active Desktop Calendar V7.86 注册码序列号
可用Active Desktop Calendar V7.86 注册码序列号Name: www.greendown.cn Code: &nb…
日期:2022-11-24 点赞:733 阅读:6,148
Android调用系统相机、自定义相机、处理大图片
Android调用系统相机和自定义相机实例本博文主要是介绍了android上使用相机进行拍照并显示的两种方式,并且由于涉及到要把拍到的照片显…
日期:2022-11-24 点赞:512 阅读:7,781
Struts的使用
一、Struts2的获取  Struts的官方网站为:http://struts.apache.org/  下载完Struts2的jar包,…
日期:2022-11-24 点赞:671 阅读:4,860