Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- + git -C /2TB_HDD/Sean/github/feijao/msm-3.10/ fetch origin refs/tags/LA.BR.1.2.3-00310-8x09.0
- From https://source.codeaurora.org/quic/la/kernel/msm-3.10
- * tag LA.BR.1.2.3-00310-8x09.0 -> FETCH_HEAD
- + git -C /2TB_HDD/Sean/github/feijao/msm-3.10/ clean -df
- + 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
- From https://source.codeaurora.org/quic/la/kernel/msm-3.10
- * tag LA.BR.1.2.3-00310-8x09.0 -> FETCH_HEAD
- 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'
- ++ git -C /2TB_HDD/Sean/github/feijao/msm-3.10/ status
- ++ egrep 'both modified|both added'
- ++ wc -l
- + conflict_count=0
- + git -C /2TB_HDD/Sean/github/feijao/msm-3.10/ merge --abort
- fatal: There is no merge to abort (MERGE_HEAD missing).
- + echo -e '\tTag refs/tags/LA.BR.1.2.3-00310-8x09.0 has 0 conflicts.'
- Tag refs/tags/LA.BR.1.2.3-00310-8x09.0 has 0 conflicts.
- + '[' 0 -le 246913578246644640 ']'
- + BEST_TAG=refs/tags/LA.BR.1.2.3-00310-8x09.0
Advertisement
Add Comment
Please, Sign In to add comment