Git force a manual merge

Asked Feb 16 '18 at 15:23

Active Feb 16 '18 at 15:23

Viewed 49 times

I'm working with a git repo that has two branches:

Branch A runs on specially designated hardware

Branch B is based on a specific commit in Branch A, and removes some code to allow it to run on my laptop.

I've made some changes on Branch B that I'd like to merge into Branch A, but whenever I attempt a merge (even with git merge --no-commit --no-ff) it will automatically merge the part of Branch B where I removed all of the specific device code for Branch A.

I'd like to be able to force a manual merge, is there a way to do this?

asked Feb 16 '18 at 15:23

T. Wallis

Merging is the wrong terminology here, and `--no-commit` and `--no-ff` are completely unrelated to what you're trying to accomplish. – user229044 Feb 16 '18 at 15:24
Is there a correct terminology? I'd just like to move some, but not all, changes from one branch to another. – T. Wallis Feb 16 '18 at 15:45
See the linked duplicate, you're after a "cherry pick". – user229044 Feb 16 '18 at 15:51

Git force a manual merge

0 Answers0