summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar http://joeyh.name/ <http://joeyh.name/@web>2013-12-27 19:06:05 +0000
committerGravatar admin <admin@branchable.com>2013-12-27 19:06:05 +0000
commit1203674e4131f0d4646867d70f3a5cb1c348b3e7 (patch)
treeeaeb5326716955db0791e07e372b741e0784b964 /doc
parente3ba7ce6d8aa21119c3dc22b6da10cb8c8871cac (diff)
Added a comment
Diffstat (limited to 'doc')
-rw-r--r--doc/forum/Tracking_a_directory_with_some_hg_and_git_repositories/comment_1_9fc3f6c2f7379755e0084a850fa9acd4._comment10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/forum/Tracking_a_directory_with_some_hg_and_git_repositories/comment_1_9fc3f6c2f7379755e0084a850fa9acd4._comment b/doc/forum/Tracking_a_directory_with_some_hg_and_git_repositories/comment_1_9fc3f6c2f7379755e0084a850fa9acd4._comment
new file mode 100644
index 000000000..c61ea9a4d
--- /dev/null
+++ b/doc/forum/Tracking_a_directory_with_some_hg_and_git_repositories/comment_1_9fc3f6c2f7379755e0084a850fa9acd4._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.227"
+ subject="comment 1"
+ date="2013-12-27T19:05:59Z"
+ content="""
+I don't recommend using git-annex that way.
+
+.git directories cannot be checked into git, so will just be skipped. A hg repository will be checked in, but you can get into all kinds of bad situations if making commits to the \"same\" hg repository in two different locations. You will end up having to manually resolve conflicted merges to the files used by your distributed version control system, which defeats the point of using distributed version control.
+"""]]