Welcome to Software Development on Codidact!
Will you help us build our independent community of developers helping developers? We're small and trying to grow. We welcome questions about all aspects of software development, from design to code to QA and more. Got questions? Got answers? Got code you'd like someone to review? Please join us.
Post History
git checkout --ours -- * --theirs would do the opposite, i.e. keep the changes from branch-y. Don't forget to git add later!
Answer
#2: Post edited
by
Quasímodo
·
2022-08-06T16:13:50Z (over 2 years ago)
Mention "--theirs"; Fix unadequate syntax highlighting
git checkout --ours -- *- Don't forget to `git add` later!
- ```none
- git checkout --ours -- *
- ```
- `--theirs` would do the opposite, i.e. keep the changes from `branch-y`.
- Don't forget to `git add` later!
#1: Initial revision
by
Quasímodo
·
2022-08-04T19:46:43Z (over 2 years ago)
git checkout --ours -- * Don't forget to `git add` later!