git 解决冲突

Windows PowerShell
版权所有 (C) Microsoft Corporation。保留所有权利。

尝试新的跨平台 PowerShell https://aka.ms/pscore6

PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git status
On branch index-page
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   theme/assets/theme.scss.liquid
        modified:   theme/layout/theme.liquid
        modified:   theme/sections/collection-template.liquid
        modified:   theme/sections/collection.liquid
        modified:   theme/sections/h-feature-new-arrival.liquid
        modified:   theme/sections/h-footer.liquid
        modified:   theme/sections/slideshow.liquid

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        theme/assets/swiper-bundle.min.css
        theme/assets/swiper-bundle.min.js

no changes added to commit (use "git add" and/or "git commit -a")
PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git add .
warning: LF will be replaced by CRLF in theme/assets/swiper-bundle.min.css.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in theme/assets/swiper-bundle.min.js.
The file will have its original line endings in your working directory
PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git commit -m '新增pc首页配置和页面'
[index-page 0c34677] 新增pc首页配置和页面
 10 files changed, 918 insertions(+), 123 deletions(-)
 create mode 100644 theme/assets/swiper-bundle.min.css
 create mode 100644 theme/assets/swiper-bundle.min.js
 create mode 100644 theme/sections/h-slideshow.liquid
PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git fetch
remote: Enumerating objects: 48, done.
remote: Counting objects: 100% (48/48), done.
remote: Compressing objects: 100% (31/31), done.
Unpacking objects: 100% (36/36), 9.41 KiB | 105.00 KiB/s, done.
From http://172.16.1.100:8888/jiawei.li/powervision-shopify-store
   fb81ad1..6d3bc70  featuar-0001-mengli -> origin/featuar-0001-mengli
   365f5dd..0a05d6a  master              -> origin/master
PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git merge origin/master
Auto-merging theme/sections/collection-template.liquid
CONFLICT (content): Merge conflict in theme/sections/collection-template.liquid
Auto-merging theme/assets/theme.scss.liquid
Automatic merge failed; fix conflicts and then commit the result.
PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git status
On branch index-page
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
        modified:   theme/assets/theme.js
        modified:   theme/assets/theme.scss.liquid
        modified:   theme/sections/header_new.liquid
        modified:   theme/sections/product-template-s1.liquid
        modified:   theme/sections/product-template.liquid
        modified:   theme/sections/s1-in-the-box.liquid
        modified:   theme/templates/collection.liquid
        modified:   theme/templates/product.product-template-s1.liquid

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   theme/sections/collection-template.liquid

PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git add .
PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git status
On branch index-page
All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)        

Changes to be committed:
        modified:   theme/assets/theme.js
        modified:   theme/assets/theme.scss.liquid
        modified:   theme/sections/collection-template.liquid
        modified:   theme/sections/header_new.liquid
        modified:   theme/sections/product-template-s1.liquid
        modified:   theme/sections/product-template.liquid   
        modified:   theme/sections/s1-in-the-box.liquid
        modified:   theme/templates/collection.liquid
        modified:   theme/templates/product.product-template-s1.liquid

PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git log         
commit 0c34677c764a49e1db970fcf58325b30a035d652 (HEAD -> index-page)
Date:   Thu Sep 30 16:15:05 2021 +0800

    新增pc首页配置和页面

commit 0e76af484cb882de619ffb9abc0b2d05a8881da7
Merge: ad1ee31 365f5dd
Author: zhanghuanhuan <huanhuan.zhang@powervision.me>
Date:   Wed Sep 29 16:56:51 2021 +0800

    Merge remote-tracking branch 'origin/master' into index-page

commit ad1ee318366812987d31ffb322e4acad99cc86ca
Author: zhanghuanhuan <huanhuan.zhang@powervision.me>
Date:   Wed Sep 29 16:55:24 2021 +0800

Author: jiawei li <jiawei.li@powervision.me>
Date:   Wed Sep 29 16:53:07 2021 +0800

PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git status
On branch index-page
  (use "git commit" to conclude merge)

Changes to be committed:
        modified:   theme/assets/theme.js
        modified:   theme/assets/theme.scss.liquid
        modified:   theme/sections/collection-template.liquid
        modified:   theme/sections/header_new.liquid
        modified:   theme/sections/product-template-s1.liquid
        modified:   theme/sections/product-template.liquid
        modified:   theme/sections/s1-in-the-box.liquid
        modified:   theme/templates/collection.liquid
        modified:   theme/templates/product.product-template-s1.liquid

PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git commit -m '修改collection-template冲突'
[index-page 8ddf164] 修改collection-template冲突
PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git push
fatal: The current branch index-page has no upstream branch.
To push the current branch and set the remote as upstream, use

    git push --set-upstream origin index-page

PS C:\Users\PV\Desktop\workplace\powervision-shopify-store> git push --set-upstream origin index-page
Enumerating objects: 96, done.
Counting objects: 100% (83/83), done.
Delta compression using up to 12 threads
Compressing objects: 100% (51/51), done.
Writing objects: 100% (52/52), 60.11 KiB | 5.01 MiB/s, done.
Total 52 (delta 31), reused 0 (delta 0), pack-reused 0
remote:
remote: To create a merge request for index-page, visit:
remote:   http://172.16.1.100:8888/jiawei.li/powervision-shopify-store/-/merge_requests/new?merge_request%5Bsource_branch%5D=index-page
remote:
To http://172.16.1.100:8888/jiawei.li/powervision-shopify-store.git
 * [new branch]      index-page -> index-page
Branch 'index-page' set up to track remote branch 'index-page' from 'origin'.
PS C:\Users\PV\Desktop\workplace\powervision-shopify-store>