diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-05-25 13:46:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-05-25 13:46:48 -0400 |
| commit | ca2e3e3b1010b3f17f6f45ffecc40d7e2e5e4ad0 (patch) | |
| tree | d1b753b1aa3e607ec36c8c7c0005a5bc4f71f5bc | |
| parent | 48325750438ef077b28de478bf3dc7e27b7cab8f (diff) | |
comment
| -rw-r--r-- | doc/forum/Different_branches_for_different_devices__63__/comment_3_534f1e2cfcc0b6d184ef4968ec33dc89._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/forum/Different_branches_for_different_devices__63__/comment_3_534f1e2cfcc0b6d184ef4968ec33dc89._comment b/doc/forum/Different_branches_for_different_devices__63__/comment_3_534f1e2cfcc0b6d184ef4968ec33dc89._comment new file mode 100644 index 000000000..54642fdb2 --- /dev/null +++ b/doc/forum/Different_branches_for_different_devices__63__/comment_3_534f1e2cfcc0b6d184ef4968ec33dc89._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2017-05-25T17:44:59Z" + content=""" +You'd need to checkout the phone branch on the laptop and make the changes +to it. So there can be some extra work involved since you have to maintain +two branches. In some cases `git cherry-pick` could be used to pick a +change from one branch to the other. +"""]] |