Sign Up

Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.

Have an account? Sign In

Have an account? Sign In Now

Sign In

Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.

Sign Up Here

Forgot Password?

Don't have account, Sign Up Here

Forgot Password

Lost your password? Please enter your email address. You will receive a link and will create a new password via email.

Have an account? Sign In Now

You must login to ask question.

Forgot Password?

Need An Account, Sign Up Here

Please briefly explain why you feel this question should be reported.

Please briefly explain why you feel this answer should be reported.

Please briefly explain why you feel this user should be reported.

Sign InSign Up

StackOverflow Point

StackOverflow Point Navigation

  • Web Stories
  • Badges
  • Tags
Search
Ask A Question

Mobile menu

Close
Ask a Question
  • Web Stories
  • Badges
  • Tags
Home/ Questions/Q 186146
Alex Hales
  • 0
Alex HalesTeacher
Asked: June 10, 20222022-06-10T17:40:14+00:00 2022-06-10T17:40:14+00:00

git rebase orphan branch and delete missing files

  • 0

[ad_1]

I’ve checked out an orphan branch and am applying it to a branch with an unrelated history. This works great except for one scenario–deletions. If the source branch deletes a tracked file, the deletion does not carry over to the target branch when I apply the orphan branch.

git switch sourceBranch
git checkout --orphan orphanBranch
git rebase -X theirs otherRemote/targetBranch

As I said, this works fine until a tracked file is deleted from sourceBranch. The deletion doesn’t get applied to targetBranch. Is there a way to have files that are missing from a snapshot be deleted?

(note: I’m rebasing to avoid the merge commit. Since these are unrelated histories, it won’t ever FF.)

[ad_2]

  • 0 0 Answers
  • 3 Views
  • 0 Followers
  • 0
Share
  • Facebook
  • Report
Leave an answer

Leave an answer
Cancel reply

Browse

Sidebar

Ask A Question

Related Questions

  • xcode - Can you build dynamic libraries for iOS and ...

    • 0 Answers
  • bash - How to check if a process id (PID) ...

    • 396 Answers
  • database - Oracle: Changing VARCHAR2 column to CLOB

    • 370 Answers
  • What's the difference between HEAD, working tree and index, in ...

    • 361 Answers
  • Amazon EC2 Free tier - how many instances can I ...

    • 0 Answers

Stats

  • Questions : 43k

Subscribe

Login

Forgot Password?

Footer

Follow

© 2022 Stackoverflow Point. All Rights Reserved.

Insert/edit link

Enter the destination URL

Or link to existing content

    No search term specified. Showing recent items. Search or use up and down arrow keys to select an item.