Merge Conflict
Chester Wyke November 02, 2023 Updated: April 15, 2025 #gitAccept their/ours
For conflicts it’s generally best to look at each and make a decision. If you are a priori sure which one you want, here are the commands to do it without opening the file to see.
Warning!: If you are rebasing --ours
and --theirs
are swapped.
Take ours
Take theirs