From f6236233433c9bec9071189a05081dea78346e62 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 25 May 2017 13:46:48 -0400 Subject: [PATCH] comment --- ...comment_3_534f1e2cfcc0b6d184ef4968ec33dc89._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Different_branches_for_different_devices__63__/comment_3_534f1e2cfcc0b6d184ef4968ec33dc89._comment 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 0000000000..54642fdb2f --- /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. +"""]]