Git - Ignore files during merge

Question

I have a repo called myrepo on the remote beanstalk server   I cloned it to my local machine  Created two additional branches  staging and dev  Pushed these branches to remote as well   Now     local                   remote                   server  --------------------------------------------------------    master     gt  Pushes to   master      gt  deployed to  prod   staging    gt  Pushes to   staging     gt  deployed to  staging   dev        gt  Pushes to   dev         gt  deployed to  dev    I have a file called config xml which is different on each branch   I want to ignore this file only during merges  But I want this to be included when I checkout or commit from   to the repo branch   The reason I want this is  we have a deploy script that pulls  checkout  the specific branch and deploys on the respective servers  So we need config xml file of that specific branch go into the specific server as indicated above when deployed   I guess  gitignore wont work  What are the other options  Note that the ignored file should be part of checkout and commit  which is important  it should be ignored only during merges   Thanks

User · Answer

gitattributes - is a root-level file of your repository that defines the attributes for a subdirectory or subset of files  You can specify the attribute to tell Git to use different merge strategies for a specific file  Here  we want to preserve the existing config xml for our branch  We need to set the merge foo to config xml in  gitattributes file  merge foo tell git to use our current branch  file  if a merge conflict occurs   Add a  gitattributes file at the root level of the repository  You can set up an attribute for confix xml in the  gitattributes file   lt pattern gt  merge foo  Let s take an example for config xml  config xml merge foo   And then define a dummy foo merge strategy with     git config --global merge foo driver true    If you merge the stag form dev branch  instead of having the merge conflicts with the config xml file  the stag branch s config xml preserves at whatever version you originally had  for more reference  merge strategies

User · Answer

Here git-update-index - Register file contents in the working tree to the index   git update-index --assume-unchanged  lt PATH OF THE FILE gt    Example -     git update-index --assume-unchanged somelocation pom xml

User · Answer

I got over this issue by using git merge command with the --no-commit option and then explicitly removed the staged file and ignore the changes to the file  E g   say I want to ignore any changes to myfile txt I proceed as follows   git merge --no-ff --no-commit  lt merge-branch gt  git reset HEAD myfile txt git checkout -- myfile txt git commit -m  merged  lt merge-branch gt     You can put statements 2  amp  3 in a for loop  if you have a list of files to skip

User · Answer

You could start by using git merge --no-commit  and then edit the merge however you like i e  by unstaging config xml or any other file  then commit   I suspect you d want to automate it further after that using hooks  but I think it d be worth going through manually at least once

User · Answer

You could use  gitignore to keep the config xml out of the repository  and then use a post commit hook to upload the appropriate config xml file to the server

User · Answer

I ended up finding git attributes  Trying it  Working so far  Did not check all scenarios yet  But it should be the solution   Merge Strategies - Git attributes

User · Answer

Example    You have two branches  master  develop You created file in develop branch and want to ignore it while merging   Code   git config --global merge ours driver true git checkout master echo  path file to ignore merge ours   gt  gt   gitattributes git merge develop   You can also ignore files with same extension  for example all files with  txt extension   echo    txt merge ours   gt  gt   gitattributes

[git] Git - Ignore files during merge

Examples related to git

Examples related to merge

Examples related to push

Examples related to ignore

Examples related to repository