summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar mario <mario@web>2017-05-25 12:01:46 +0000
committerGravatar admin <admin@branchable.com>2017-05-25 12:01:46 +0000
commita6508adaad064017cda645b977b2f2603218cb2b (patch)
treec1a20b9dc18c534e19422e3c1128713ba492dba9
parent4d993b7448c69411995c3fd7887a6e21fbd1b0c3 (diff)
Added a comment
-rw-r--r--doc/forum/Different_branches_for_different_devices__63__/comment_2_214c71d2ab43e4d1bf564ea8337909b7._comment10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/forum/Different_branches_for_different_devices__63__/comment_2_214c71d2ab43e4d1bf564ea8337909b7._comment b/doc/forum/Different_branches_for_different_devices__63__/comment_2_214c71d2ab43e4d1bf564ea8337909b7._comment
new file mode 100644
index 000000000..f06be601a
--- /dev/null
+++ b/doc/forum/Different_branches_for_different_devices__63__/comment_2_214c71d2ab43e4d1bf564ea8337909b7._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="mario"
+ avatar="http://cdn.libravatar.org/avatar/4c63b0935789d29210d0bd8cad8d7ac7"
+ subject="comment 2"
+ date="2017-05-25T12:01:46Z"
+ content="""
+Hi, thanks for your help.
+
+But I don't get it entirely. Let's say I move photos from the phone folder into another folder (on the laptop, after merging, in the master branch). How do I propagate these changes back into the phone branch? Since, I guess, merging would only work one-way in this setting. Or let's say I want to push a new picture from my laptop into the phone branch, how would I do this?
+"""]]