diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog <Michael@web> | 2013-07-19 17:01:38 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2013-07-19 17:01:38 +0000 |
| commit | 4fa78b491bda68a2ed871855a13c14704f3b9a6a (patch) | |
| tree | f2965c1e726271d0413179ade0073a518ff041ee /doc | |
| parent | 7b13f803c27baa3ebb54de55b2f9c6c150edf78a (diff) | |
Added a comment: merge/rebase drivers?
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/forum/safely_dropping_git-annex_history/comment_8_ae4b761fc42a020f3ce3aa6ef6ec4ec1._comment | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/doc/forum/safely_dropping_git-annex_history/comment_8_ae4b761fc42a020f3ce3aa6ef6ec4ec1._comment b/doc/forum/safely_dropping_git-annex_history/comment_8_ae4b761fc42a020f3ce3aa6ef6ec4ec1._comment new file mode 100644 index 000000000..d761813b0 --- /dev/null +++ b/doc/forum/safely_dropping_git-annex_history/comment_8_ae4b761fc42a020f3ce3aa6ef6ec4ec1._comment @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog" + nickname="Michael" + subject="merge/rebase drivers?" + date="2013-07-19T17:01:38Z" + content=""" +I've tried rebasing git-annex branch, and I hit a bunch of conflicts (both in uuid.log and for individual content file logs) of the form: + +<<<<<<< HEAD +1369615760.859476s 1 016d9095-0cbc-4734-a498-4e0421e257d7 +======= +1369615760.845334s 1 016d9095-0cbc-4734-a498-4e0421e257d7 +>>>>>>> 52e60e8... update +1369615359.195672s 1 38c359dc-a7d9-498d-a818-2e9beae995b8 + +As I understand, git-annex has a special timestamp-based merge driver to deal with these. Is there a way to use that with git rebase? +"""]] |