git - Have two different copies of same file in two different branches -

-

do know how have 2 different copies of same file in 2 different branches in git?

let assume have file called config.
i'm trying achieve have copy of file in dev branch different in master branch.

the important thing file can't ignored in gitignored.

you can checkout 2 branches. modify file , commit them each branch.

if want merge branches , have 2 separate files (different content) in each branch, commit changed branches , set desired file tin .gitattributed grab ours file - result in file never overwritten

read , set here:
https://git-scm.com/book/en/v2/customizing-git-git-attributes#merge-strategies

you can use git attributes tell git use different merge strategies specific files in project.

one useful option tell git not try merge specific files when have conflicts, rather use side of merge on else’s.

this helpful if branch in project has diverged or specialized, want able merge changes in it, and want ignore files. 

config_file merge=ours

as @torec mentioned in comment:

beware of consider bug in git: if git able trivially merge file not run custom merge driver. git tries simple 2-way merge first, before attempting 3-way merge

so option use smudge/clear filter make sure have right file.

smudge

read , set here:
https://git-scm.com/book/en/v2/customizing-git-git-attributes

it turns out can write own filters doing substitutions in files on commit/checkout.

these called clean , smudge filters.

in .gitattributes file, can set filter particular paths , set scripts process files before they’re checked out (“smudge”, see figure 8-2) , before they’re staged (“clean”, see figure 8-3).

these filters can set sorts of fun things.

enter image description here


Comments

Post a Comment

Popular posts from this blog

Django REST Framework perform_create: You cannot call `.save()` after accessing `serializer.data` -

-
i have following viewset: class artistprofileviewset(viewsets.modelviewset): queryset = artistprofile.objects.all() serializer_class = artistprofileserializer def perform_create(self, serializer): if serializer.is_valid(): serializer.save() with following serializers: class simpleartisttrackserializer(serializers.hyperlinkedmodelserializer): class meta: model = artisttrack fields = (...my fields...) class artistprofileserializer(serializers.hyperlinkedmodelserializer): owners = userserializer(many=true, required=false) tracks = simpleartisttrackserializer(many=true, required=false) class meta: model = artistprofile fields = (...my fields...) i getting following error: assertionerror: cannot call `.save()` after accessing `serializer.data`.if need access data before committing database inspect 'serializer.validated_data' instead. i don't see editing serializer.data object. th...
Read more

Why does Go error when trying to marshal this JSON? -

-
i'm trying rather simple example of trying decode json file structs using golang. however, when attempting error that json: cannot unmarshal object go value of type []main.track which don't understand. here's code in question, , json can found here . package main import ( "encoding/json" "fmt" "net/http" "os" ) // tracks group of track types type tracks struct { tracks []track } // track represents singular track type track struct { name string url string artist artist } // artist represents single artist type artist struct { name string mbid string url string } func main() { url := "http://ws.audioscrobbler.com/2.0/?method=geo.gettoptracks&api_key=c1572082105bd40d247836b5c1819623&format=json&country=netherlands" response, err := http.get(url) if err != nil { fmt.printf("%s\n", err) os.exit(1) } de...
Read more