Story: in the middle of a project my colleague created a new branch from master and started doing her heavy re-factoringwork. I created my branch from master and started doing new stuff on the page. W
I ran a git pull that ended in a conflict. I resolved the conflictand everything is fine now (I used mergetool also).
I am on branch mybranch1. mybranch2 is forked from mybranch1 and changes were made in mybranch2. Then, while on mybranch1, I have done git merge --no-commit mybranch2
I just need a plain list of conflicted files. Is there anything simpler than: git ls-files -u| cut -f 2 | sort -u
I have two branches, master and demand_prediction_module. contents of master branch are: co开发者_开发问答ntents of demand_prediction_module branch are:
加载中,请稍侯......