Make up to date with VertebrateResequencing / pbwt ?

[CholoTook]

Perhaps it's my anal-retentive personality type, but the fact that you've diverged really bugs me.

If you don't want to merge changes, these should be separate projects no?

Cheers,

[CholoTook]

Gah... there's clearly too much here... Lets look at just the 13 commits in this fork that aren't in the VertebrateResequencing fork...

[richarddurbin]

Hi Dan. Sorry, I just picked up this thread and will look at this. Richard

From: Dan Bolser @.> Date: Tuesday, 8 March 2022 at 14:52 To: richarddurbin/pbwt @.> Cc: Subscribed @.***> Subject: Re: [richarddurbin/pbwt] Make up to date with VertebrateResequencing / pbwt ? (PR #50)

Gah... there's clearly too much here... Lets look at just the 13 commits in this fork that aren't in the VertebrateResequencing fork...

— Reply to this email directly, view it on GitHubhttps://github.com/richarddurbin/pbwt/pull/50#issuecomment-1061861521, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AA2FXZSGFGPFSFHCSABLZKLU65SSLANCNFSM5QGR6KYA. Triage notifications on the go with GitHub Mobile for iOShttps://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 or Androidhttps://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub. You are receiving this because you are subscribed to this thread.Message ID: @.***>

[CholoTook]

So... git show verts/production..durbo/master

Looks OK... git rebase durbo/master

[CholoTook]

Thanks so much, I got confused quite quickly trying to merge the two.

git rebase durbo/master
First, rewinding head to replay your work on top of it...
Applying: set htslib=1.2.1, pbwt=3.1 and link against bsd
Using index info to reconstruct a base tree...
A    makefile
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): makefile deleted in HEAD and modified in set
htslib=1.2.1, pbwt=3.1 and link against bsd. Version set htslib=1.2.1,
pbwt=3.1 and link against bsd of makefile left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 set htslib=1.2.1, pbwt=3.1 and link against bsd
hint: Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".

On Tue, 8 Mar 2022 at 15:03, Richard Durbin @.***> wrote:

Hi Dan. Sorry, I just picked up this thread and will look at this. Richard

From: Dan Bolser @.> Date: Tuesday, 8 March 2022 at 14:52 To: richarddurbin/pbwt @.> Cc: Subscribed @.***> Subject: Re: [richarddurbin/pbwt] Make up to date with VertebrateResequencing / pbwt ? (PR #50)

Gah... there's clearly too much here... Lets look at just the 13 commits in this fork that aren't in the VertebrateResequencing fork...

— Reply to this email directly, view it on GitHub< https://github.com/richarddurbin/pbwt/pull/50#issuecomment-1061861521>, or unsubscribe< https://github.com/notifications/unsubscribe-auth/AA2FXZSGFGPFSFHCSABLZKLU65SSLANCNFSM5QGR6KYA

. Triage notifications on the go with GitHub Mobile for iOS< https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android< https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub . You are receiving this because you are subscribed to this thread.Message ID: @.***>

— Reply to this email directly, view it on GitHub https://github.com/richarddurbin/pbwt/pull/50#issuecomment-1061872823, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANKSZTROJ7T5B7YTDZR2SB3U65T3ZANCNFSM5QGR6KYA . Triage notifications on the go with GitHub Mobile for iOS https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 or Android https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub.

You are receiving this because you authored the thread.Message ID: @.***>