Branching: different config files for release/development

by

It sounds like you should read up on git attributes. Check out the section at the bottom of this page

This is helpful if a branch in your project has diverged or is
specialized, but you want to be able to merge changes back in from it,
and you want to ignore certain files. Say you have a database settings
file called database.xml that is different in two branches, and you
want to merge in your other branch without messing up the database
file.

More Related Contents:

  1. Branch from a previous commit using Git
  2. What exactly do we mean by “branch”?
  3. How do I clone a single branch in Git?
  4. Default behavior of “git push” without a branch specified
  5. Track all remote git branches as local branches
  6. Using the slash character in Git branch name
  7. Where is the global git config data stored?
  8. Vendor Branches in Git
  9. How can I search Git branches for a file or directory?
  10. Forking vs. Branching in GitHub
  11. How do I get the current branch name in Git?
  12. How do I create a remote Git branch?
  13. How do I delete all Git branches which have been merged?
  14. How do I merge my local uncommitted changes into another Git branch?
  15. How to commit my current changes to a different branch in Git [duplicate]
  16. Pull a certain branch from the remote server
  17. Reordering of commits
  18. Does deleting a branch in git remove it from the history?
  19. How do you remove an invalid remote branch reference from Git?
  20. Git branch strategy for small dev team [closed]
  21. Delete local Git branches after deleting them on the remote repo
  22. How to protect “master” in github?
  23. How to get default Git branch?
  24. Switch branch and ignore any changes without committing
  25. main branch and ‘origin/main’ have diverged, how to ‘undiverge’ branches’?
  26. How do I list all remote branches in Git 1.7+?
  27. How do I run git log to see changes only for a specific branch?
  28. git push error: src refspec main does not match any on linux
  29. git branch permissions
  30. Commit a file to a Different Branch Without Checkout

Leave a Comment