deadman96385

Untitled

Jan 23rd, 2019
276
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.17 KB | None | 0 0
  1. + git -C /2TB_HDD/Sean/github/feijao/msm-3.10/ fetch origin refs/tags/LA.BR.1.2.3-00310-8x09.0
  2. From https://source.codeaurora.org/quic/la/kernel/msm-3.10
  3. * tag LA.BR.1.2.3-00310-8x09.0 -> FETCH_HEAD
  4. + git -C /2TB_HDD/Sean/github/feijao/msm-3.10/ clean -df
  5. + git -C /2TB_HDD/Sean/github/feijao/msm-3.10/ pull --no-commit origin refs/tags/LA.BR.1.2.3-00310-8x09.0 --allow-unrelated-histories
  6. From https://source.codeaurora.org/quic/la/kernel/msm-3.10
  7. * tag LA.BR.1.2.3-00310-8x09.0 -> FETCH_HEAD
  8. fatal: update_ref failed for ref 'HEAD': cannot update ref 'refs/heads/master': trying to write non-commit object 053665626414c7799a43daf7672648eb791b3d37 to branch 'refs/heads/master'
  9. ++ git -C /2TB_HDD/Sean/github/feijao/msm-3.10/ status
  10. ++ egrep 'both modified|both added'
  11. ++ wc -l
  12. + conflict_count=0
  13. + git -C /2TB_HDD/Sean/github/feijao/msm-3.10/ merge --abort
  14. fatal: There is no merge to abort (MERGE_HEAD missing).
  15. + echo -e '\tTag refs/tags/LA.BR.1.2.3-00310-8x09.0 has 0 conflicts.'
  16. Tag refs/tags/LA.BR.1.2.3-00310-8x09.0 has 0 conflicts.
  17. + '[' 0 -le 246913578246644640 ']'
  18. + BEST_TAG=refs/tags/LA.BR.1.2.3-00310-8x09.0
Advertisement
Add Comment
Please, Sign In to add comment