19:50, 13/07/2021
I"m merging two branches. I assume I"m on HEAD branch right now. When I only want to piông chồng one branche"s version of the file. The one I want to lớn pichồng depends on the contents, not on the branch.

For example on the image below I want lớn piông chồng the second line:


But from which line does the second line come? I vị not really understand the output of the program here.

Bạn đang xem: Com


The branch names are right there next lớn the conflict markers. The one you used with your last checkout is "ours", the one you mentioned in the git merge commvà is theirs.

Xem thêm: 2525 Những Câu Stt Hay Về Con Trai Và Bí Kíp Thả Thính Chỉ Có Dính

In fact, I cannot vì better than lớn quote git help merge:


I did a little thử nghiệm with Sourcetree (4.1.0, 24Mar2021) that clarifies at least this use case

branch mineA, text "a"branch mineB, text "b"current branch: mineBmerge mineA into lớn mineBresolve conflict using "mine"text: "b"


Thanks for contributing an answer lớn Staông xã Overflow!

Please be sure to answer the question. Provide details and chia sẻ your research!

But avoid

Asking for help, clarification, or responding to other answers.Making statements based on opinion; baông xã them up with references or personal experience.

To learn more, see our tips on writing great answers.

Post Your Answer Discard

By clicking “Post Your Answer”, you agree to lớn our terms of service, privacy policy and cookie policy

Not the answer you're looking for? Browse other questions tagged git atlassian-sourcetree or ask your own question.


site kiến thiết / biểu tượng logo © 2021 Staông xã Exchange Inc; user contributions licensed under cc by-sa. rev2021.7.13.39719

Stack Overflow works best with JavaScript enabled

Your privacy

By clicking “Accept all cookies”, you agree Stack Exchange can store cookies on your device and discthua information in accordance with our Cookie Policy.