Sharing rerere cache

by

It can be shared via a dedicated branch. You want to stop if there is a conflict on that branch and resolve it as it means that there were attempts to solve the same conflict in 2 different ways. Needless to say, that will be the exception to the rule.

For the others on this question, google “Branch per Feature” to see where this is useful.

Hooks can automate syncing the common rr-cache branch.

Here is what you need to automate. rereresharing is an example branch that you are merging to, rr-cache is a branch that stores the resolutions; all these steps worked without issue:

git checkout --orphan rereresharing start-sprint-1 
git --git-dir=.git --work-tree=.git/rr-cache checkout -b rr-cache
git --git-dir=.git --work-tree=.git/rr-cache add -A
git --git-dir=.git --work-tree=.git/rr-cache commit -m "initial cache"
git clean -xdf
git checkout rereresharing 
git merge --no-ff FTR-1
git merge --no-ff FTR-2
vim opinion.txt # resolve conflict 
git add -A
git commit
git checkout rr-cache 
git --git-dir=.git --work-tree=.git/rr-cache add -A
git --git-dir=.git --work-tree=.git/rr-cache commit -m "resolution"
git remote add origin ../bpf-central
git push origin rereresharing rr-cache 
cd - # assumes you were previously in the other local repo
git remote add origin ../bpf-central
git fetch
git branch rr-cache origin/rr-cache 
ls .git/rr-cache
git --git-dir=.git --work-tree=.git/rr-cache checkout rr-cache -- .
ls .git/rr-cache

You are now ready to do the same merge and you will have your conflict resolved.

More Related Contents:

  1. How do I resolve merge conflicts in a Git repository?
  2. I ran into a merge conflict. How can I abort the merge?
  3. When do you use Git rebase instead of Git merge?
  4. Git workflow and rebase vs merge questions
  5. Git merge left HEAD marks in my files
  6. Undo git pull, how to bring repos to old state
  7. I ran into a merge conflict. How do I abort the merge?
  8. What is git-rerere and how does it work?
  9. Get changes from master into branch in Git
  10. How do I fix a merge conflict due to removal of a file in a branch?
  11. How do I discard unstaged changes in Git?
  12. Undo a Git merge that hasn’t been pushed yet
  13. Have Git Select Local Version On Merge Conflict on a Specific File?
  14. Why do I need to explicitly push a new branch?
  15. Committing Machine Specific Configuration Files
  16. What does “Git push non-fast-forward updates were rejected” mean?
  17. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  18. Gitlab repository mirroring
  19. How do I delete all Git branches which have been merged?
  20. Git log output to XML, JSON, or YAML?
  21. Flexible vs static branching (Git vs Clearcase/Accurev)
  22. Git allows for branch change with unstaged changes
  23. Merge development branch with master
  24. Git: How to remove file from index without deleting files from any repository
  25. How to list branches that contain an equivalent commit
  26. Alter repository directory structure using sparse checkout
  27. How do you undo “Discard all changes” in VS Code/Git
  28. Git: Ignore files for public repository, but not for private
  29. Is there a way to compare two diffs or patches?
  30. Clone only the .git directory of a git repo

Leave a Comment